Merge pull request swiftlang#68595 from ahoppen/ahoppen/batch-completion

ahoppen · web-flow · commit 9b31e9a69f27 · 2023-09-20T17:26:09.000-07:00
[tests] Add a `%batch-code-completion` lit substitution
diff --git a/test/IDE/complete_accessor.swift b/test/IDE/complete_accessor.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // WITH_GETSET: Keyword/None:                       get; name=get
 // WITH_GETSET: Keyword/None:                       set; name=set
diff --git a/test/IDE/complete_after_self.swift b/test/IDE/complete_after_self.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===---
 //===--- Tests for code completion after 'self'.
diff --git a/test/IDE/complete_after_super.swift b/test/IDE/complete_after_super.swift
@@ -1,8 +1,7 @@
 // RUN: sed -n -e '/VERIFY_BEGIN/,/VERIFY_END$/ p' %s > %t_no_errors.swift
 // RUN: %target-swift-frontend -verify -typecheck %t_no_errors.swift
 
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // NO_CONSTRUCTORS-NOT: init(
 
diff --git a/test/IDE/complete_ambiguous.swift b/test/IDE/complete_ambiguous.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct A {
   func doAThings() -> A { return self }
diff --git a/test/IDE/complete_async_context.swift b/test/IDE/complete_async_context.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t 
+// RUN: %batch-code-completion
 
 // REQUIRES: concurrency
 
diff --git a/test/IDE/complete_asyncannotation.swift b/test/IDE/complete_asyncannotation.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t 
+// RUN: %batch-code-completion
 
 // REQUIRES: concurrency
 
diff --git a/test/IDE/complete_at_top_level.swift b/test/IDE/complete_at_top_level.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // NORESULT: Token
 
diff --git a/test/IDE/complete_call_arg.swift b/test/IDE/complete_call_arg.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 var i1 = 1
 var i2 = 2
diff --git a/test/IDE/complete_concurrency_specifier.swift b/test/IDE/complete_concurrency_specifier.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t 
+// RUN: %batch-code-completion
 
 // REQUIRES: concurrency
 
diff --git a/test/IDE/complete_constructor.swift b/test/IDE/complete_constructor.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func freeFunc() {}
 
diff --git a/test/IDE/complete_dont_filter_overloads_with_cc_token.swift b/test/IDE/complete_dont_filter_overloads_with_cc_token.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func buildView<T>(@MyViewBuilder _ x: () -> T) {}
 
diff --git a/test/IDE/complete_effectful_accessor.swift b/test/IDE/complete_effectful_accessor.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 var globalAsyncVar: Int {
   get async {
diff --git a/test/IDE/complete_enum_elements.swift b/test/IDE/complete_enum_elements.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===---
 //===--- Test that we can complete enum elements.
diff --git a/test/IDE/complete_enum_unresolved_dot_argument_labels.swift b/test/IDE/complete_enum_unresolved_dot_argument_labels.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 enum DragState {
   case inactive
diff --git a/test/IDE/complete_expr_after_paren.swift b/test/IDE/complete_expr_after_paren.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol MyProtocol {
   init(init1: Int)
diff --git a/test/IDE/complete_expr_postfix_begin.swift b/test/IDE/complete_expr_postfix_begin.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //
 // Test code completion at the beginning of expr-postfix.
diff --git a/test/IDE/complete_global_actorisolation.swift b/test/IDE/complete_global_actorisolation.swift
@@ -1,5 +1,5 @@
 // REQUIRES: concurrency
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t 
+// RUN: %batch-code-completion
 
 class MyNonSendable {}
 struct MySendable {}
diff --git a/test/IDE/complete_globalactorunsafe.swift b/test/IDE/complete_globalactorunsafe.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t 
+// RUN: %batch-code-completion
 // REQUIRES: concurrency
 
 // SAFE_NOTREC: Begin completions, 2 items
diff --git a/test/IDE/complete_in_accessors.swift b/test/IDE/complete_in_accessors.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===--- Helper types that are used in this test
 
diff --git a/test/IDE/complete_in_closures.swift b/test/IDE/complete_in_closures.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // EMTPY: Token
 // EMPTY-NOT: Begin completions
diff --git a/test/IDE/complete_in_ifconfig.swift b/test/IDE/complete_in_ifconfig.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct MyStruct {
     init() {}
diff --git a/test/IDE/complete_in_result_builder.swift b/test/IDE/complete_in_result_builder.swift
@@ -1,5 +1,4 @@
-// RUN %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 @resultBuilder
 struct TupleBuilder<T> {
diff --git a/test/IDE/complete_inout.swift b/test/IDE/complete_inout.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct Bar() {
     init?(withInout: inout Int) {}
diff --git a/test/IDE/complete_invalid_result_builder.swift b/test/IDE/complete_invalid_result_builder.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 enum Either<T,U> { case first(T), second(U) }
 indirect enum ResultBuilderTerm<Expression> {
diff --git a/test/IDE/complete_issue-56810.swift b/test/IDE/complete_issue-56810.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // https://github.com/apple/swift/issues/56810
 
diff --git a/test/IDE/complete_keywords.swift b/test/IDE/complete_keywords.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // KW_RETURN: Keyword[return]/None: return{{; name=.+$}}
 // KW_NO_RETURN-NOT: Keyword[return]
diff --git a/test/IDE/complete_literal.swift b/test/IDE/complete_literal.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 {
   1.#^LITERAL1^#
diff --git a/test/IDE/complete_macro_attribute.swift b/test/IDE/complete_macro_attribute.swift
@@ -1,6 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t/output
-
+// RUN: %batch-code-completion
 
 @freestanding(#^FREESTANDING_ROLE^#)
 macro FreestandingMacro
diff --git a/test/IDE/complete_macro_declaration.swift b/test/IDE/complete_macro_declaration.swift
@@ -1,6 +1,5 @@
 // REQUIRES: swift_swift_parser
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 let globalVar = 1
 macro expect(file: Int = #^DEFAULT_ARG^#) = #externalMacro(module: "MyModule", type: "MyMacro")
diff --git a/test/IDE/complete_member_type.swift b/test/IDE/complete_member_type.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 class A {
   typealias T = Int
diff --git a/test/IDE/complete_multibracestmt.swift b/test/IDE/complete_multibracestmt.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 enum E {
   case bar
diff --git a/test/IDE/complete_multiple_trailingclosure.swift b/test/IDE/complete_multiple_trailingclosure.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func globalFunc1(fn1: () -> Int, fn2: () -> String) {}
 func testGlobalFunc() {
diff --git a/test/IDE/complete_opaque_result.swift b/test/IDE/complete_opaque_result.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol MyProtocol {
   associatedtype Mistery
diff --git a/test/IDE/complete_operators.swift b/test/IDE/complete_operators.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct S {}
 postfix operator ++ {}
diff --git a/test/IDE/complete_optional_binding.swift b/test/IDE/complete_optional_binding.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 let topLevelOpt: Int?
 
diff --git a/test/IDE/complete_optional_function.swift b/test/IDE/complete_optional_function.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t) 
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func foo(_ x: ((_ x: Int, _ y: Int) -> Void)?) {
   x?(1, #^OPTIONAL_PARAMETER^#)
diff --git a/test/IDE/complete_pattern.swift b/test/IDE/complete_pattern.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===--- Helper types that are used in this test
 
diff --git a/test/IDE/complete_property_delegate_attribute.swift b/test/IDE/complete_property_delegate_attribute.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 enum MyEnum {
   case east, west
diff --git a/test/IDE/complete_protocol_static_member.swift b/test/IDE/complete_protocol_static_member.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol FontStyle {}
 struct FontStyleOne: FontStyle {}
diff --git a/test/IDE/complete_protocol_typealias.swift b/test/IDE/complete_protocol_typealias.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol MyProto {
   typealias Content = Int
diff --git a/test/IDE/complete_rdar71005827.swift b/test/IDE/complete_rdar71005827.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 private enum GlobalPrivateE {
     case foo, bar
diff --git a/test/IDE/complete_rdar80489548.swift b/test/IDE/complete_rdar80489548.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t.ccp)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // KW_IN: Keyword[in]/None: in{{; name=.+$}}
 // KW_NO_IN-NOT: Keyword[in]
diff --git a/test/IDE/complete_result_builder_func_signature.swift b/test/IDE/complete_result_builder_func_signature.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 @resultBuilder struct MyBuilder {
     static func buildBlock() -> Int
diff --git a/test/IDE/complete_sequence_invalid.swift b/test/IDE/complete_sequence_invalid.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // GLOBAL: Decl[GlobalVar]/CurrModule:         invalidDecl[#<<error type>>#];
 let invalidDecl = INVALID
diff --git a/test/IDE/complete_shadowing.swift b/test/IDE/complete_shadowing.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // LOCAL_STRING_TESTVALUE-NOT: name=testValue
 // LOCAL_STRING_TESTVALUE:     Decl[LocalVar]/Local: testValue[#String#]; name=testValue
diff --git a/test/IDE/complete_single_expression_return.swift b/test/IDE/complete_single_expression_return.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // MARK: Single-expression closures
 
diff --git a/test/IDE/complete_sself.swift b/test/IDE/complete_sself.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // NOSELF-NOT: name=Self
 
diff --git a/test/IDE/complete_stmt_controlling_expr.swift b/test/IDE/complete_stmt_controlling_expr.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct FooStruct {
   var instanceVar : Int
diff --git a/test/IDE/complete_super_self.swift b/test/IDE/complete_super_self.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 class BaseClass {
   func returnSelf() -> Self {}
diff --git a/test/IDE/complete_trailing_if_expr.swift b/test/IDE/complete_trailing_if_expr.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 struct MyStruct {
   func takeAnotherClosure(_ y: () -> Void) {}
diff --git a/test/IDE/complete_type.swift b/test/IDE/complete_type.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===--- Helper types that are used in this test
 
diff --git a/test/IDE/complete_type_any.swift b/test/IDE/complete_type_any.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func testAnyInParamList(a: #^ANY_IN_FUNC_PARAM^#
 // ANY_IN_FUNC_PARAM-DAG: Keyword/None: Any[#Any#]; name=Any
diff --git a/test/IDE/complete_type_attribute.swift b/test/IDE/complete_type_attribute.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // TYPEATTR-NOT: myIntValue
 // TYPEATTR-DAG: Keyword/None:                       autoclosure[#Type Attribute#]; name=autoclosure
diff --git a/test/IDE/complete_type_in_func_param.swift b/test/IDE/complete_type_in_func_param.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 //===--- Helper types that are used in this test
 
diff --git a/test/IDE/complete_unapplied_static_ref_to_func_with_error.swift b/test/IDE/complete_unapplied_static_ref_to_func_with_error.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 // Check that we don't crash
 
 func myGlobalFunction() -> Invalid {}
diff --git a/test/IDE/complete_value_expr.swift b/test/IDE/complete_value_expr.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // Test code completion of expressions that produce a value.
 
diff --git a/test/IDE/complete_value_literals.swift b/test/IDE/complete_value_literals.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func testAll0() {
   // Not type context.
diff --git a/test/IDE/complete_with_adjacent_string_literal.swift b/test/IDE/complete_with_adjacent_string_literal.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 func takeClosure(x: () -> Void) {}
 func takeString(_ a: String) -> MyStruct {}
diff --git a/test/IDE/complete_with_trailing_closure.swift b/test/IDE/complete_with_trailing_closure.swift
diff --git a/test/IDE/complete_without_constraint_type.swift b/test/IDE/complete_without_constraint_type.swift
diff --git a/test/IDE/complete_yield.swift b/test/IDE/complete_yield.swift
diff --git a/test/IDE/copy_expr.swift b/test/IDE/copy_expr.swift
diff --git a/test/IDE/move_expr.swift b/test/IDE/move_expr.swift
diff --git a/test/lit.cfg b/test/lit.cfg
diff --git a/validation-test/IDE/crashers_2_fixed/0037-constructor-with-error-type.swift b/validation-test/IDE/crashers_2_fixed/0037-constructor-with-error-type.swift
diff --git a/validation-test/IDE/crashers_2_fixed/0038-setTypeForArgumentIgnoredForCompletion.swift b/validation-test/IDE/crashers_2_fixed/0038-setTypeForArgumentIgnoredForCompletion.swift
diff --git a/validation-test/IDE/crashers_2_fixed/0039-not-all-primary-assoc-types-specified.swift b/validation-test/IDE/crashers_2_fixed/0039-not-all-primary-assoc-types-specified.swift
diff --git a/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift b/validation-test/IDE/crashers_fixed/subexpr-literal-in-sequence-expr.swift
diff --git a/validation-test/IDE/issues_fixed/issue-55423.swift b/validation-test/IDE/issues_fixed/issue-55423.swift
diff --git a/validation-test/IDE/issues_fixed/issue-57041.swift b/validation-test/IDE/issues_fixed/issue-57041.swift
diff --git a/validation-test/IDE/issues_fixed/issue-57439.swift b/validation-test/IDE/issues_fixed/issue-57439.swift
diff --git a/validation-test/IDE/issues_fixed/rdar63063279.swift b/validation-test/IDE/issues_fixed/rdar63063279.swift
diff --git a/validation-test/IDE/issues_fixed/rdar64227741.swift b/validation-test/IDE/issues_fixed/rdar64227741.swift
diff --git a/validation-test/IDE/issues_fixed/rdar69813796.swift b/validation-test/IDE/issues_fixed/rdar69813796.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t`
	`1`	`+// RUN: %batch-code-completion`
`2`	`2`
`3`	`3`	`// REQUIRES: concurrency`
`4`	`4`