[TEST] Switch to use new swift-driver when running tests

test/ClangImporter/pch-bridging-header-vs-modular-interface-defn.swift

@@ -77,7 +77,7 @@
 // RUN: rm -rf %t
 // RUN: mkdir -p %t/Headers/Simple
 // RUN: ln -s %S/Inputs/frameworks/Simple.framework/Headers/Simple.h %t/Headers/Simple/Simple.h
-// RUN: %target-build-swift -emit-module -module-name test -Xfrontend -enable-objc-interop -Xfrontend -disable-deserialization-recovery -v -F %S/Inputs/frameworks -Xcc "-I%t/Headers" -module-cache-path %t/clang-module-cache -import-objc-header %S/Inputs/pch-bridging-header-with-non-modular-import.h %S/Inputs/other.swift %s
+// RUN: %target-build-swift -emit-module -module-name test -Xfrontend -enable-objc-interop -Xfrontend -disable-deserialization-recovery -v -F %S/Inputs/frameworks -Xcc -I -Xcc %t/Headers -module-cache-path %t/clang-module-cache -import-objc-header %S/Inputs/pch-bridging-header-with-non-modular-import.h %S/Inputs/other.swift %s
 
 import Simple
 class Foo: SimpleProtocol {

test/ClangImporter/pch-bridging-header-with-another-bridging-header.swift

@@ -2,7 +2,7 @@
 // RUN: %target-build-swift -emit-module -disable-bridging-pch -import-objc-header %S/Inputs/pch-bridging-header-with-another-bridging-header/app.h -I %S/Inputs/pch-bridging-header-with-another-bridging-header -module-name App -emit-module-path %t/App.swiftmodule %S/../Inputs/empty.swift
 // RUN: llvm-bcanalyzer -dump %t/App.swiftmodule | %FileCheck %s
 
-// CHECK: IMPORTED_HEADER{{.*}}Inputs/pch-bridging-header-with-another-bridging-header/app.h
+// CHECK: IMPORTED_HEADER{{.*}}Inputs{{/|\\}}pch-bridging-header-with-another-bridging-header{{/|\\}}app.h
 
 // Now load the app-module-with-bridging-header along with another bridging
 // header that we precompile. This is going to the frontend directly to make

test/ClangImporter/pcm-emit-and-import.swift

@@ -4,9 +4,9 @@
 
 // Verify some of the output of the -dump-pcm flag.
 // RUN: %swift-dump-pcm %t/script.pcm | %FileCheck %s --check-prefix=CHECK-DUMP
-// CHECK-DUMP: Information for module file '{{.*}}/script.pcm':
+// CHECK-DUMP: Information for module file '{{.*}}{{[/|\\]}}script.pcm':
 // CHECK-DUMP:   Module name: script
-// CHECK-DUMP:   Module map file: {{.*[/\\]}}Inputs{{/|\\}}custom-modules{{/|\\}}module.modulemap
+// CHECK-DUMP:   Module map file: {{.*}}Inputs{{/|\\}}custom-modules{{/|\\}}module.modulemap
 
 // Compile a source file that imports the explicit module.
 // RUN: %target-swift-frontend -typecheck -verify -Xcc -fmodule-file=%t/script.pcm %s

test/ClangImporter/pcm-emit-direct-cc1-mode.swift

@@ -4,7 +4,7 @@
 
 // Verify some of the output of the -dump-pcm flag.
 // RUN: %swift-dump-pcm %t/script.pcm | %FileCheck %s --check-prefix=CHECK-DUMP
-// CHECK-DUMP: Information for module file '{{.*}}/script.pcm':
+// CHECK-DUMP: Information for module file '{{.*}}{{[/|\\]}}script.pcm':
 // CHECK-DUMP:   Module name: script
 // CHECK-DUMP:   Module map file: {{.*[/\\]}}Inputs{{/|\\}}custom-modules{{/|\\}}module.modulemap
 

test/DebugInfo/ASTSection-single.swift

@@ -10,6 +10,6 @@
 // RUN: %target-swift-modulewrap %t/a0.swiftmodule -o %t/a0-mod.o
 
 // RUN: %lldb-moduleimport-test -verbose %t/a0-mod.o | %FileCheck %s
-// CHECK: Path: {{.*}}/Inputs, framework=false, system=false
+// CHECK: Path: {{.*}}{{/|\\}}Inputs, framework=false, system=false
 // CHECK: Importing a0...
 // CHECK: Import successful!

test/DebugInfo/module-compilation-dir.swift

@@ -3,4 +3,4 @@
 // RUN: %target-swift-emit-pcm -g -module-name Macro -o %t/Macro.pcm -file-compilation-dir /compdir %S/Inputs/module.modulemap
 // RUN: %llvm-dwarfdump %t/Macro.pcm | %FileCheck %s
 
-// CHECK: DW_AT_comp_dir	("/compdir")
+// CHECK: DW_AT_comp_dir	("{{/|\\}}compdir")

test/Driver/lit.local.cfg

@@ -0,0 +1,2 @@
+if not 'legacy_swift_driver' in config.available_features:
+    config.unsupported = True

test/IDE/local_types.swift

@@ -3,6 +3,7 @@
 // Avoid emitting the module separately since that would skip non-inlinable
 // function bodies without types, and we want to print the decls in
 // `singleDefaultArgument`.
+// REQUIRES: legacy_swift_driver
 // RUN: %empty-directory(%t)
 // RUN: %target-swiftc_driver -v -no-emit-module-separately -emit-module -module-name LocalTypes -o %t/LocalTypes.swiftmodule %s
 // RUN: %target-swift-ide-test -print-local-types -I %t -module-to-print LocalTypes -source-filename %s > %t.dump

test/IDE/merge_local_types.swift

@@ -1,5 +1,6 @@
 // Tests merging of modules each with their own local types
 
+// REQUIRES: legacy_swift_driver
 // RUN: %empty-directory(%t)
 
 // Create separate modules and merge them together

test/Index/Store/driver-include-locals.swift

@@ -6,8 +6,8 @@
 //
 // RUN: %target-swiftc_driver -driver-print-jobs -emit-object -index-ignore-system-modules -index-store-path %t/index_store -o %t/file.o %s | %FileCheck -check-prefix=JOBS %s
 // RUN: %target-swiftc_driver -driver-print-jobs -emit-object -index-ignore-system-modules -index-include-locals -index-store-path %t/index_store -o %t/file.o %s | %FileCheck -check-prefix=LOCAL-JOBS %s
-// JOBS-NOT: {{.*}}swift{{(c|c-legacy-driver|-frontend)?(\.exe)?"?}} -frontend {{.*}}-index-store-path {{.*}}/index_store{{"?}} -index-include-locals
-// LOCAL-JOBS: {{.*}}swift{{(c|c-legacy-driver|-frontend)?(\.exe)?"?}} -frontend {{.*}}-index-store-path {{.*}}/index_store{{"?}} -index-include-locals
+// JOBS-NOT: {{.*}}swift{{(c|c-legacy-driver|-frontend)?(\.exe)?"?}} -frontend {{.*}}-index-store-path {{.*}}{{/|\\}}index_store{{"?}} -index-include-locals
+// LOCAL-JOBS: {{.*}}swift{{(c|c-legacy-driver|-frontend)?(\.exe)?"?}} -frontend {{.*}}-index-store-path {{.*}}{{/|\\}}index_store{{"?}} -index-include-locals
 //
 // Verify the frontend actually generates local index data:
 //

test/ModuleInterface/convenience-init-merge-module.swift

@@ -0,0 +1,44 @@
+// REQUIRES: legacy_swift_driver
+// RUN: %empty-directory(%t)
+
+// Generate the parseable interface of the current file via the merge-modules step
+// RUN: %target-build-swift -no-emit-module-separately -emit-module -o %t/Test.swiftmodule -emit-module-interface-path %t/TestMerge.swiftinterface -module-name Test %s
+
+// Make sure both don't add override for inits shadowing convenience initializers
+// RUN: %FileCheck %s < %t/TestMerge.swiftinterface
+
+// Check we can consume the interface without issue
+// RUN: %target-swift-frontend -swift-version 5 -compile-module-from-interface -o %t/Test.swiftmodule %t/TestMerge.swiftinterface
+
+public class Base {
+  let x: Int
+  public init(x: Int) {
+    self.x = x
+  }
+  convenience public init() {
+    self.init(x: 1)
+  }
+}
+
+public class Derived: Base {
+  // CHECK: {{^}}  public init(z: Swift.Int)
+  public init(z: Int) {
+    super.init(x: z)
+  }
+  // CHECK: {{^}}  public convenience init()
+  convenience public init() {
+    self.init(z: 1)
+  }
+}
+
+public class Derived2: Base {
+  // CHECK: {{^}}  public init()
+  public init() {
+    super.init(x: 1)
+  }
+
+  // CHECK: {{^}}  override public convenience init(x: Swift.Int)
+  override convenience public init(x: Int) {
+    self.init()
+  }
+}

test/ModuleInterface/convenience-init.swift

@@ -1,18 +1,13 @@
 // RUN: %empty-directory(%t)
 
-// Generate the parseable interface of the current file via the merge-modules step
-// RUN: %target-build-swift -no-emit-module-separately -emit-module -o %t/Test.swiftmodule -emit-module-interface-path %t/TestMerge.swiftinterface -module-name Test %s
-
 // Generate the parseable interface of the current file via a single frontend invocation
 // RUN: %target-swift-frontend -typecheck  -enable-objc-interop -emit-module-interface-path %t/TestSingle.swiftinterface -module-name Test %s
 
 // Make sure both don't add override for inits shadowing convenience initializers
-// RUN: %FileCheck --check-prefixes=CHECK,SINGLE %s < %t/TestSingle.swiftinterface
-// RUN: %FileCheck --check-prefixes=CHECK,MERGE %s < %t/TestMerge.swiftinterface
+// RUN: %FileCheck --check-prefixes=CHECK %s < %t/TestSingle.swiftinterface
 
 // Check we can consume the interface without issue
 // RUN: %target-swift-frontend -swift-version 5 -compile-module-from-interface -o %t/Test.swiftmodule %t/TestSingle.swiftinterface
-// RUN: %target-swift-frontend -swift-version 5 -compile-module-from-interface -o %t/Test.swiftmodule %t/TestMerge.swiftinterface
 
 public class Base {
   let x: Int
@@ -29,8 +24,7 @@ public class Derived: Base {
   public init(z: Int) {
     super.init(x: z)
   }
-  // MERGE: {{^}}  public convenience init()
-  // SINGLE: {{^}}  convenience public init()
+  // CHECK: {{^}}  convenience public init()
   convenience public init() {
     self.init(z: 1)
   }
@@ -42,8 +36,7 @@ public class Derived2: Base {
     super.init(x: 1)
   }
 
-  // MERGE: {{^}}  override public convenience init(x: Swift.Int)
-  // SINGLE: {{^}}  override convenience public init(x: Swift.Int)
+  // CHECK: {{^}}  override convenience public init(x: Swift.Int)
   override convenience public init(x: Int) {
     self.init()
   }

test/ModuleInterface/enums-layout-merge-module.swift

@@ -0,0 +1,85 @@
+// REQUIRES: legacy_swift_driver
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift -no-emit-module-separately -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
+// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-MULTI-FILE %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
+// RUN: %target-swift-frontend -enable-objc-interop -compile-module-from-interface %t/Lib.swiftinterface -o  %t/compiled-from-interface.swiftmodule -module-name Lib
+// RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s
+
+
+import Lib
+
+// CHECK-LABEL: define{{.+}}testFutureproofEnum
+func testFutureproofEnum() -> FutureproofEnum {
+  // Check a few things in the function to make sure it's getting the case
+  // representation dynamically.
+  // CHECK: [[CASE:%.+]] = load i32, ptr @"$s3Lib15FutureproofEnumO1byA2CmFWC"
+  // CHECK: [[METADATA_RESPONSE:%.+]] = tail call swiftcc %swift.metadata_response @"$s3Lib15FutureproofEnumOMa"
+  // CHECK: [[METADATA:%.+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0
+  // CHECK: call void {{%.+}}(ptr noalias %0, i32 [[CASE]], ptr [[METADATA]])
+  // CHECK-NEXT: ret void
+  return .b
+} // CHECK-NEXT: {{^}$}}
+
+// CHECK-LABEL: define{{.+}}testFrozenEnum
+func testFrozenEnum() -> FrozenEnum {
+  // CHECK: ret i8 1
+  return .b
+} // CHECK-NEXT: {{^}$}}
+
+// CHECK-LABEL: define{{.+}}testFutureproofObjCEnum
+func testFutureproofObjCEnum() -> FutureproofObjCEnum {
+  // CHECK: ret i{{32|64}} 10
+  return .b
+} // CHECK-NEXT: {{^}$}}
+
+// CHECK-LABEL: define{{.+}}testFrozenObjCEnum
+func testFrozenObjCEnum() -> FrozenObjCEnum {
+  // CHECK: ret i{{32|64}} 10
+  return .b
+} // CHECK-NEXT: {{^}$}}
+
+// CHECK-LABEL: define{{.+}}testFutureproofUnicodeScalarEnum
+func testFutureproofUnicodeScalarEnum() -> FutureproofUnicodeScalarEnum {
+  // CHECK: [[CASE:%.+]] = load i32, ptr @"$s3Lib28FutureproofUnicodeScalarEnumO1ayA2CmFWC"
+  // CHECK: [[METADATA_RESPONSE:%.+]] = tail call swiftcc %swift.metadata_response @"$s3Lib28FutureproofUnicodeScalarEnumOMa"
+  // CHECK: [[METADATA:%.+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0
+  // CHECK: call void {{%.+}}(ptr noalias %0, i32 [[CASE]], ptr [[METADATA]])
+  // CHECK-NEXT: ret void
+  return .a
+}
+
+// CHECK-LABEL: define{{.+}}testFutureproofIndirectEnum
+func testFutureproofIndirectEnum() -> FutureproofIndirectEnum {
+  // CHECK: [[CASE:%.+]] = load i32, ptr @"$s3Lib23FutureproofIndirectEnumO1cyA2CmFWC"
+  // CHECK: [[METADATA_RESPONSE:%.+]] = tail call swiftcc %swift.metadata_response @"$s3Lib23FutureproofIndirectEnumOMa"
+  // CHECK: [[METADATA:%.+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0
+  // CHECK: call void {{%.+}}(ptr noalias %0, i32 [[CASE]], ptr [[METADATA]])
+  // CHECK-NEXT: ret void
+  return .c
+}
+
+// CHECK-LABEL: define{{.+}}testFrozenIndirectEnum
+func testFrozenIndirectEnum() -> FrozenIndirectEnum {
+  // Whether this is "1" or "2" depends on whether the reserved ObjC tagged
+  // pointer bit is the top or bottom bit on this platform.
+  // CHECK: ret i{{32|64}} {{1|2}}
+  return .c
+}
+
+// CHECK-LABEL: define{{.+}}testFutureproofIndirectCaseEnum
+func testFutureproofIndirectCaseEnum() -> FutureproofIndirectCaseEnum {
+  // CHECK: [[CASE:%.+]] = load i32, ptr @"$s3Lib27FutureproofIndirectCaseEnumO1cyA2CmFWC"
+  // CHECK: [[METADATA_RESPONSE:%.+]] = tail call swiftcc %swift.metadata_response @"$s3Lib27FutureproofIndirectCaseEnumOMa"
+  // CHECK: [[METADATA:%.+]] = extractvalue %swift.metadata_response [[METADATA_RESPONSE]], 0
+  // CHECK: call void {{%.+}}(ptr noalias %0, i32 [[CASE]], ptr [[METADATA]])
+  // CHECK-NEXT: ret void
+  return .c
+}
+
+// CHECK-LABEL: define{{.+}}testFrozenIndirectCaseEnum
+func testFrozenIndirectCaseEnum() -> FrozenIndirectCaseEnum {
+  // Whether this is "1" or "2" depends on whether the reserved ObjC tagged
+  // pointer bit is the top or bottom bit on this platform.
+  // CHECK: ret i{{32|64}} {{1|2}}
+  return .c
+}

test/ModuleInterface/enums-layout.swift

@@ -1,11 +1,4 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -no-emit-module-separately -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
-// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-MULTI-FILE %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
-// RUN: %target-swift-frontend -enable-objc-interop -compile-module-from-interface %t/Lib.swiftinterface -o  %t/compiled-from-interface.swiftmodule -module-name Lib
-// RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s
-
-// Try again using a single-frontend build.
-// RUN: %empty-directory(%t)
 // RUN: %target-build-swift -whole-module-optimization -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
 // RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-SINGLE-FRONTEND %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
 // RUN: %target-swift-frontend -enable-objc-interop -compile-module-from-interface %t/Lib.swiftinterface -o  %t/compiled-from-interface.swiftmodule -module-name Lib

test/PlaygroundTransform/extended_callbacks.swift

@@ -21,26 +21,26 @@ if (a) {
 for i in 0..<3 {
   i
 }
-// CHECK: [{{.*}}] __builtin_log_with_id_extended[a='true' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='5' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='1' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='2' module: main. file: {{.*/main.swift}}]
+// CHECK: [{{.*}}] __builtin_log_with_id_extended[a='true' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='5' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='1' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='2' module: main. file: {{.*main.swift}}]
 
 var b = true
 for i in 0..<3 {
   i
   continue
 }
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[b='true' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='1' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='2' module: main. file: {{.*/main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[b='true' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='1' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='2' module: main. file: {{.*main.swift}}]
 
 var c = true
 for i in 0..<3 {
   i
   break
 }
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[c='true' module: main. file: {{.*/main.swift}}]
-// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*/main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[c='true' module: main. file: {{.*main.swift}}]
+// CHECK-NEXT: [{{.*}}] __builtin_log_with_id_extended[='0' module: main. file: {{.*main.swift}}]

test/Serialization/search-paths.swift

@@ -36,15 +36,15 @@ numeric(42) // expected-error {{cannot find 'numeric' in scope}}
 // CHECK: <INPUT_BLOCK
 // CHECK-NOT: /secret'
 // CHECK-NOT: /Frameworks'
-// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=1 op1=0/> blob data = '{{.+}}/Frameworks'
+// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=1 op1=0/> blob data = '{{.+}}Frameworks'
 // CHECK-NOT: /secret'
 // CHECK-NOT: /Frameworks'
 // CHECK-NOT: /SystemFrameworks'
-// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=1 op1=1/> blob data = '{{.+}}/SystemFrameworks'
+// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=1 op1=1/> blob data = '{{.+}}SystemFrameworks'
 // CHECK-NOT: /secret'
 // CHECK-NOT: /Frameworks'
 // CHECK-NOT: /SystemFrameworks'
-// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=0 op1=0/> blob data = '{{.+}}/secret'
+// CHECK: <SEARCH_PATH abbrevid={{[0-9]+}} op0=0 op1=0/> blob data = '{{.+}}secret'
 // CHECK-NOT: /secret'
 // CHECK-NOT: /Frameworks'
 // CHECK-NOT: /SystemFrameworks'

test/SourceKit/CursorInfo/cursor_symbol_graph_referenced.swift

@@ -225,7 +225,7 @@ extension Parent {
 // NESTED-NEXT: [[ExtInner_USR]] | internal | {{.*}}cursor_symbol_graph_referenced.swift | cursor_symbol_graph_referenced | User | NonSPI | source.lang.swift
 // NESTED-NEXT:   Parent swift.struct s:30cursor_symbol_graph_referenced6ParentV
 // NESTED-NEXT:   ExtInner swift.struct [[ExtInner_USR]]
-// NESTED-NEXT: [[FromSomeModule_USR]] | public | {{.*}}/SomeModule.swift | SomeModule | User | NonSPI | source.lang.swift
+// NESTED-NEXT: [[FromSomeModule_USR]] | public | {{.*}}SomeModule.swift | SomeModule | User | NonSPI | source.lang.swift
 // NESTED-NEXT:   FromSomeModule swift.struct [[FromSomeModule_USR]]
 // NESTED-NEXT: REFERENCED DECLS END
 

test/SourceKit/InterfaceGen/gen_module_group.swift

@@ -4,10 +4,10 @@
 // RUN: %sourcekitd-test -req=interface-gen -module MyModule -group-name B -- -I %t.mod -target %target-triple | %FileCheck -check-prefix=GROUPB %s
 
 // FIXME: We don't currently handle group info for multi-file builds,
-// so just make sure we don't crash.
-// RUN: %empty-directory(%t.multifrontend)
-// RUN: %target-build-swift -module-name MyModule -emit-module -emit-module-path %t.multifrontend/MyModule.swiftmodule -no-emit-module-separately -Xfrontend -group-info-path -Xfrontend %S/Inputs/group.json %S/Inputs/swift_mod.swift %S/Inputs/swift_mod_syn.swift
-// RUN: %sourcekitd-test -req=interface-gen -module MyModule -group-name A -- -I %t.multifrontend -target %target-triple | %FileCheck -check-prefix=EMPTY %s
+// so just make sure we don't crash. Disable since swift-driver stops supporting merge module.
+// DISABLED: %empty-directory(%t.multifrontend)
+// DISABLED: %target-build-swift -module-name MyModule -emit-module -emit-module-path %t.multifrontend/MyModule.swiftmodule -no-emit-module-separately -Xfrontend -group-info-path -Xfrontend %S/Inputs/group.json %S/Inputs/swift_mod.swift %S/Inputs/swift_mod_syn.swift
+// DISABLED: %sourcekitd-test -req=interface-gen -module MyModule -group-name A -- -I %t.multifrontend -target %target-triple | %FileCheck -check-prefix=EMPTY %s
 
 // GROUPA: MyClass
 // GROUPA-NOT: P1

test/TypeDecoder/clashing_abi_name.swift

@@ -6,7 +6,7 @@
 // RUN: cd %t
 
 // RUN: %target-build-swift -emit-library -emit-module -parse-as-library -module-name Foo -module-abi-name Bar -g %t/Foo.swift 
-// RUN: %target-build-swift -emit-executable -I %t -L %t -lFoo -g -emit-module -module-name Bar -module-abi-name Bar %t/Bar.swift
+// RUN: %target-build-swift -emit-executable -I %t -L %t -lFoo -g -emit-module -module-name Bar -module-abi-name Bar %t/Bar.swift -o %t/Bar
 
 
 // RUN: sed -ne '/\/\/ *DEMANGLE-TYPE: /s/\/\/ *DEMANGLE-TYPE: *//p' < %s > %t/input