Merge pull request #34579 from rintaro/ide-test-batchcompletion-xfail

[CodeCompletion] Add XFAIL to swift-ide-test

Author: rintaro

test/IDE/complete_type.swift

@@ -407,7 +407,7 @@ func testTypeInTupleType6() {
 }
 
 func testTypeInTupleType7() {
-  var localVar: (a: b: #^TYPE_IN_TUPLE_TYPE_7?skip=FIXME^#
+  var localVar: (a: b: #^TYPE_IN_TUPLE_TYPE_7?xfail=FIXME^#
 }
 
 //===---

tools/swift-ide-test/swift-ide-test.cpp

@@ -923,6 +923,7 @@ struct CompletionTestToken {
   StringRef Name;
   SmallVector<StringRef, 1> CheckPrefixes;
   StringRef Skip;
+  StringRef Xfail;
   Optional<bool> IncludeKeywords = None;
   Optional<bool> IncludeComments = None;
 
@@ -1003,6 +1004,10 @@ struct CompletionTestToken {
           Result.Skip = Value;
           continue;
         }
+        if (Key == "xfail") {
+          Result.Xfail = Value;
+          continue;
+        }
         Error = "unknown option (" + Key.str() + ") for token";
         return true;
       }
@@ -1166,6 +1171,7 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
 
   // Process tokens.
   SmallVector<StringRef, 0> FailedTokens;
+  SmallVector<StringRef, 0> UPassTokens;
   for (const auto &Token : CCTokens) {
     if (!options::CodeCompletionToken.empty() &&
         options::CodeCompletionToken != Token.Name)
@@ -1185,6 +1191,11 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
       continue;
     }
 
+    bool failureExpected = !Token.Xfail.empty();
+    if (failureExpected) {
+      llvm::errs() << "Xfail: " << Token.Xfail << "\n";
+    }
+
     auto IncludeKeywords = CodeCompletionKeywords;
     if (Token.IncludeKeywords)
       IncludeKeywords = *Token.IncludeKeywords;
@@ -1291,23 +1302,37 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
       }
     }
 
-    if (isFileCheckFailed) {
+    if (isFileCheckFailed == failureExpected) {
+      // Success. The result may be huge. Remove the result if it's succeeded.
+      llvm::sys::fs::remove(resultFilename);
+    } else if (isFileCheckFailed) {
+      // Unexpectedly failed.
       FailedTokens.push_back(Token.Name);
     } else {
-      // The result may be huge. Remove the result if it's succeeded.
-      llvm::sys::fs::remove(resultFilename);
+      // Unexpectedly passed.
+      UPassTokens.push_back(Token.Name);
     }
   }
 
+  if (FailedTokens.empty() && UPassTokens.empty())
+    return 0;
+
+  llvm::errs() << "----\n";
   if (!FailedTokens.empty()) {
-    llvm::errs() << "----\n";
     llvm::errs() << "Unexpected failures: ";
     llvm::interleave(
         FailedTokens, [&](StringRef name) { llvm::errs() << name; },
         [&]() { llvm::errs() << ", "; });
+    llvm::errs() << "\n";
   }
-
-  return !FailedTokens.empty();
+  if (!UPassTokens.empty()) {
+    llvm::errs() << "Unexpected passes: ";
+    llvm::interleave(
+        UPassTokens, [&](StringRef name) { llvm::errs() << name; },
+        [&]() { llvm::errs() << ", "; });
+    llvm::errs() << "\n";
+  }
+  return 1;
 }
 
 static int doREPLCodeCompletion(const CompilerInvocation &InitInvok,