Skip to content

Commit ff861b4

Browse files
benlangmuirbenlangmuir
authored
Merge pull request #29547 from benlangmuir/cache-path-52
[5.2] [sourcekit] Add global -module-cache-path to test executables
2 parents 66c06ab + 14f25b5 commit ff861b4

28 files changed

+269
-231
lines changed

‎test/SourceKit/CodeComplete/complete_from_clang_module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foo
22

33
// REQUIRES: objc_interop
4-
// RUN: %sourcekitd-test -req=complete -pos=2:1 %s -- %mcp_opt -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s
4+
// RUN: %sourcekitd-test -req=complete -pos=2:1 %s -- -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s
55

66
// CHECK-LABEL: key.name: "fooIntVar",
77
// CHECK-NEXT: key.sourcetext: "fooIntVar",

‎test/SourceKit/CursorInfo/cursor_info.swift

Lines changed: 99 additions & 99 deletions
Large diffs are not rendered by default.

‎test/SourceKit/CursorInfo/cursor_info_async.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Foo
99
// contention. We disable printing the requests to minimize delay.
1010

1111
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- \
12-
// RUN: -F %S/../Inputs/libIDE-mock-sdk %mcp_opt \
12+
// RUN: -F %S/../Inputs/libIDE-mock-sdk \
1313
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
1414
// RUN: == -async -dont-print-request -req=cursor -pos=60:15 \
1515
// RUN: == -async -dont-print-request -req=cursor -pos=60:15 \

‎test/SourceKit/CursorInfo/cursor_overrides.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public protocol WithInheritedAssocType : WithAssocType {
2626
}
2727

2828
// REQUIRES: objc_interop
29-
// RUN: %sourcekitd-test -req=cursor -pos=16:7 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %mcp_opt %s | %FileCheck -check-prefix=CHECK1 %s
29+
// RUN: %sourcekitd-test -req=cursor -pos=16:7 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %s | %FileCheck -check-prefix=CHECK1 %s
3030
// CHECK1: source.lang.swift.ref.function.method.instance (12:17-12:23)
3131
// CHECK1: c:@M@cursor_overrides@objc(cs)SubCls(im)meth
3232
// CHECK1: (SubCls) -> () -> ()
@@ -38,7 +38,7 @@ public protocol WithInheritedAssocType : WithAssocType {
3838
// CHECK1-NEXT: c:objc(pl)P1(im)meth
3939
// CHECK1-NEXT: OVERRIDES END
4040

41-
// RUN: %sourcekitd-test -req=cursor -pos=25:20 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %mcp_opt %s | %FileCheck -check-prefix=CHECK2 %s
41+
// RUN: %sourcekitd-test -req=cursor -pos=25:20 %s -- -embed-bitcode -I %S/Inputs/cursor-overrides %s | %FileCheck -check-prefix=CHECK2 %s
4242
// CHECK2: s:16cursor_overrides22WithInheritedAssocTypeP0eF0
4343
// CHECK2: OVERRIDES BEGIN
4444
// CHECK2-NEXT: s:16cursor_overrides13WithAssocTypeP0dE0

‎test/SourceKit/CursorInfo/cursor_stdlib.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func foo3(a: Float, b: Bool) {}
2626
// RUN: %empty-directory(%t)
2727
// RUN: %build-clang-importer-objc-overlays
2828

29-
// RUN: %sourcekitd-test -req=cursor -pos=3:18 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-OVERLAY %s
29+
// RUN: %sourcekitd-test -req=cursor -pos=3:18 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-OVERLAY %s
3030
// CHECK-OVERLAY: source.lang.swift.ref.var.global
3131
// CHECK-OVERLAY-NEXT: NSUTF8StringEncoding
3232
// CHECK-OVERLAY-NEXT: s:10Foundation20NSUTF8StringEncodingSuv
@@ -36,39 +36,39 @@ func foo3(a: Float, b: Bool) {}
3636
// CHECK-OVERLAY-NEXT: SYSTEM
3737
// CHECK-OVERLAY-NEXT: <Declaration>let NSUTF8StringEncoding: <Type usr="s:Su">UInt</Type></Declaration>
3838

39-
// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-ITERATOR %s
39+
// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-ITERATOR %s
4040
// CHECK-ITERATOR-NOT: _AnyIteratorBase
4141
// CHECK-ITERATOR: <Group>Collection/Type-erased</Group>
4242

43-
// RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT1 %s
43+
// RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT1 %s
4444
// CHECK-REPLACEMENT1: <Group>Collection/Array</Group>
4545
// CHECK-REPLACEMENT1: <Declaration>{{.*}}func sorted() -&gt; [<Type usr="s:Si">Int</Type>]</Declaration>
4646
// CHECK-REPLACEMENT1: RELATED BEGIN
4747
// CHECK-REPLACEMENT1: sorted(by:)</RelatedName>
4848
// CHECK-REPLACEMENT1: RELATED END
4949

50-
// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT2 %s
50+
// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT2 %s
5151
// CHECK-REPLACEMENT2: <Group>Collection/Array</Group>
5252
// CHECK-REPLACEMENT2: <Declaration>{{.*}}mutating func append(_ newElement: <Type usr="s:Si">Int</Type>)</Declaration>
5353

54-
// RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT3 %s
54+
// RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT3 %s
5555
// CHECK-REPLACEMENT3: <Group>Collection/Array</Group>
5656
// CHECK-REPLACEMENT3: func sorted(by areInIncreasingOrder: (<Type usr="s:13cursor_stdlib2S1V">S1</Type>
5757
// CHECK-REPLACEMENT3: sorted()</RelatedName>
5858

59-
// RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT4 %s
59+
// RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-REPLACEMENT4 %s
6060
// CHECK-REPLACEMENT4: <Group>Collection/Array</Group>
6161
// CHECK-REPLACEMENT4: <Declaration>{{.*}}mutating func append(_ newElement: <Type usr="s:13cursor_stdlib2S1V">S1</Type>)</Declaration>
6262

63-
// RUN: %sourcekitd-test -req=cursor -pos=21:10 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-MODULE-GROUP1 %s
63+
// RUN: %sourcekitd-test -req=cursor -pos=21:10 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-MODULE-GROUP1 %s
6464
// CHECK-MODULE-GROUP1: MODULE GROUPS BEGIN
6565
// CHECK-MODULE-GROUP1-DAG: Math
6666
// CHECK-MODULE-GROUP1-DAG: Collection
6767
// CHECK-MODULE-GROUP1-DAG: Collection/Array
6868
// CHECK-MODULE-GROUP1: MODULE GROUPS END
6969

70-
// RUN: %sourcekitd-test -req=cursor -pos=22:17 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-FLOAT1 %s
70+
// RUN: %sourcekitd-test -req=cursor -pos=22:17 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-FLOAT1 %s
7171
// CHECK-FLOAT1: s:Sf
7272

73-
// RUN: %sourcekitd-test -req=cursor -pos=22:25 %s -- %s %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-BOOL1 %s
73+
// RUN: %sourcekitd-test -req=cursor -pos=22:25 %s -- %s -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-BOOL1 %s
7474
// CHECK-BOOL1: s:Sb

‎test/SourceKit/CursorInfo/cursor_usr.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ func foo(x: FooStruct1) -> S1 {}
1111
// RUN: %swiftc_driver -emit-module -o %t/FooSwiftModule.swiftmodule %S/Inputs/FooSwiftModule.swift
1212

1313
// Sanity check that we have identical responses when things work.
14-
// RUN: %sourcekitd-test -req=cursor -pos=5:8 %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s > %t.from_offset.txt
15-
// RUN: %sourcekitd-test -req=cursor -usr "s:10cursor_usr2S1V" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s > %t.from_usr.txt
14+
// RUN: %sourcekitd-test -req=cursor -pos=5:8 %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s > %t.from_offset.txt
15+
// RUN: %sourcekitd-test -req=cursor -usr "s:10cursor_usr2S1V" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s > %t.from_usr.txt
1616
// RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_offset.txt
1717
// RUN: %FileCheck %s -check-prefix=CHECK_SANITY1 < %t.from_usr.txt
1818
// RUN: diff -u %t.from_usr.txt %t.from_offset.txt
@@ -25,16 +25,16 @@ func foo(x: FooStruct1) -> S1 {}
2525
// CHECK_SANITY1-NEXT: <decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>S1</decl.name></decl.struct>
2626

2727
// Bogus USR.
28-
// RUN: %sourcekitd-test -req=cursor -usr "s:blahblahblah" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=RESOLVE
28+
// RUN: %sourcekitd-test -req=cursor -usr "s:blahblahblah" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s -check-prefix=RESOLVE
2929
// Missing s: prefix.
30-
// RUN: %sourcekitd-test -req=cursor -usr "10cursor_usr6globalSivp" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=RESOLVE
30+
// RUN: %sourcekitd-test -req=cursor -usr "10cursor_usr6globalSivp" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s -check-prefix=RESOLVE
3131
// RESOLVE: <empty cursor info; internal diagnostic: "Unable to resolve type from USR.">
3232

3333
// FIXME: no support for clang USRs.
34-
// RUN: %sourcekitd-test -req=cursor -usr "c:@S@FooStruct1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=CSUPPORT
34+
// RUN: %sourcekitd-test -req=cursor -usr "c:@S@FooStruct1" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s -check-prefix=CSUPPORT
3535
// CSUPPORT: <empty cursor info; internal diagnostic: "Lookup for C/C++/ObjC USRs not implemented.">
3636

37-
// RUN: %sourcekitd-test -req=cursor -usr "s:10cursor_usr2S1V" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %mcp_opt %s | %FileCheck %s -check-prefix=CHECK1
37+
// RUN: %sourcekitd-test -req=cursor -usr "s:10cursor_usr2S1V" %s -- -I %t -F %S/../Inputs/libIDE-mock-sdk %s | %FileCheck %s -check-prefix=CHECK1
3838
// CHECK1: source.lang.swift.decl.struct (5:8-5:10)
3939
// CHECK1: s1
4040
// CHECK1: <decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>S1</decl.name></decl.struct>

‎test/SourceKit/CursorInfo/cursor_vardecl_across_fallthrough.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ switch p {
1919
print("other")
2020
}
2121

22-
// RUN: %sourcekitd-test -req=cursor -pos=13:19 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKX,CHECK1DECL %s
23-
// RUN: %sourcekitd-test -req=cursor -pos=14:18 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKX,CHECK1REF %s
22+
// RUN: %sourcekitd-test -req=cursor -pos=13:19 %s -- %s | %FileCheck -check-prefixes=CHECKX,CHECK1DECL %s
23+
// RUN: %sourcekitd-test -req=cursor -pos=14:18 %s -- %s | %FileCheck -check-prefixes=CHECKX,CHECK1REF %s
2424

2525
// CHECK1DECL: source.lang.swift.decl.var.local (13:19-13:20)
2626
// CHECK1REF: source.lang.swift.ref.var.local (13:19-13:20)
2727

28-
// RUN: %sourcekitd-test -req=cursor -pos=16:20 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKX,CHECK2DECL %s
29-
// RUN: %sourcekitd-test -req=cursor -pos=16:42 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKX,CHECK2DECL2 %s
30-
// RUN: %sourcekitd-test -req=cursor -pos=17:18 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKX,CHECK2REF %s
28+
// RUN: %sourcekitd-test -req=cursor -pos=16:20 %s -- %s | %FileCheck -check-prefixes=CHECKX,CHECK2DECL %s
29+
// RUN: %sourcekitd-test -req=cursor -pos=16:42 %s -- %s | %FileCheck -check-prefixes=CHECKX,CHECK2DECL2 %s
30+
// RUN: %sourcekitd-test -req=cursor -pos=17:18 %s -- %s | %FileCheck -check-prefixes=CHECKX,CHECK2REF %s
3131

3232
// CHECK2DECL: source.lang.swift.decl.var.local (16:20-16:21)
3333
// CHECK2DECL2: source.lang.swift.decl.var.local (16:42-16:43)
@@ -38,15 +38,15 @@ switch p {
3838
// CHECKX: Int
3939

4040

41-
// RUN: %sourcekitd-test -req=cursor -pos=13:26 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKY,CHECK3DECL %s
42-
// RUN: %sourcekitd-test -req=cursor -pos=14:23 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKY,CHECK3REF %s
41+
// RUN: %sourcekitd-test -req=cursor -pos=13:26 %s -- %s | %FileCheck -check-prefixes=CHECKY,CHECK3DECL %s
42+
// RUN: %sourcekitd-test -req=cursor -pos=14:23 %s -- %s | %FileCheck -check-prefixes=CHECKY,CHECK3REF %s
4343

4444
// CHECK3DECL: source.lang.swift.decl.var.local (13:26-13:27)
4545
// CHECK3REF: source.lang.swift.ref.var.local (13:26-13:27)
4646

47-
// RUN: %sourcekitd-test -req=cursor -pos=16:27 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKY,CHECK4DECL %s
48-
// RUN: %sourcekitd-test -req=cursor -pos=16:49 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKY,CHECK4DECL2 %s
49-
// RUN: %sourcekitd-test -req=cursor -pos=17:23 %s -- %mcp_opt %s | %FileCheck -check-prefixes=CHECKY,CHECK4REF %s
47+
// RUN: %sourcekitd-test -req=cursor -pos=16:27 %s -- %s | %FileCheck -check-prefixes=CHECKY,CHECK4DECL %s
48+
// RUN: %sourcekitd-test -req=cursor -pos=16:49 %s -- %s | %FileCheck -check-prefixes=CHECKY,CHECK4DECL2 %s
49+
// RUN: %sourcekitd-test -req=cursor -pos=17:23 %s -- %s | %FileCheck -check-prefixes=CHECKY,CHECK4REF %s
5050

5151
// CHECK4DECL: source.lang.swift.decl.var.local (16:27-16:28)
5252
// CHECK4DECL2: source.lang.swift.decl.var.local (16:49-16:50)

‎test/SourceKit/DocSupport/doc_clang_module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
// RUN: %build-clang-importer-objc-overlays
88

99
// RUN: %sourcekitd-test -req=doc-info -module Foo -- -F %S/../Inputs/libIDE-mock-sdk \
10-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response
10+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response
1111
// RUN: diff -u %s.response %t.response

‎test/SourceKit/DocSupport/doc_error_domain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: OS=macosx
22
// RUN: %sourcekitd-test -req=doc-info -module MyError -- -I %S/Inputs \
3-
// RUN: %mcp_opt -sdk %sdk | %sed_clean > %t.response
3+
// RUN: -sdk %sdk | %sed_clean > %t.response
44
// RUN: %FileCheck -input-file=%t.response %s
55

66
// CHECK: struct MyError {

‎test/SourceKit/Indexing/index_bad_modulename.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %build-clang-importer-objc-overlays
3-
// RUN: %sourcekitd-test -req=index %s -- %s -module-name Swift %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response1
3+
// RUN: %sourcekitd-test -req=index %s -- %s -module-name Swift -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response1
44
// RUN: diff -u %s.response %t.response1
5-
// RUN: %sourcekitd-test -req=index %s -- %s -module-name 12345 %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response2
5+
// RUN: %sourcekitd-test -req=index %s -- %s -module-name 12345 -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response2
66
// RUN: diff -u %s.response %t.response2
77

88
import ObjectiveC

‎test/SourceKit/Indexing/index_with_clang_module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %build-clang-importer-objc-overlays
55

66
// RUN: %sourcekitd-test -req=index %s -- %s -F %S/../Inputs/libIDE-mock-sdk \
7-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck %s
7+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck %s
88

99
import Foo
1010

‎test/SourceKit/InterfaceGen/gen_clang_module.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ var x: FooClassBase
1414
// RUN: %target-swift-frontend -emit-module -o %t.overlays -F %S/../Inputs/libIDE-mock-sdk %S/Inputs/Foo.swift
1515
//
1616
// RUN: %sourcekitd-test -req=interface-gen -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
17-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t > %t.response
17+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t > %t.response
1818
// RUN: diff -u %s.response %t.response
1919

2020
// RUN: %sourcekitd-test -req=interface-gen -module Foo.FooSub -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
21-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t > %t.sub.response
21+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t > %t.sub.response
2222
// RUN: diff -u %s.sub.response %t.sub.response
2323

2424
// RUN: %sourcekitd-test -req=interface-gen -module FooHelper -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
25-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t > %t.helper.response
25+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t > %t.helper.response
2626
// RUN: diff -u %s.helper.response %t.helper.response
2727

2828
// RUN: %sourcekitd-test -req=interface-gen -module FooHelper.FooHelperExplicit -- -I %t.overlays \
29-
// RUN: -F %S/../Inputs/libIDE-mock-sdk %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t > %t.helper.explicit.response
29+
// RUN: -F %S/../Inputs/libIDE-mock-sdk -target %target-triple %clang-importer-sdk-nosource -I %t > %t.helper.explicit.response
3030
// RUN: diff -u %s.helper.explicit.response %t.helper.explicit.response
3131

3232
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
33-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
33+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
3434
// RUN: == -req=cursor -pos=205:67 | %FileCheck -check-prefix=CHECK1 %s
3535
// The cursor points to 'FooClassBase' inside the list of base classes, see 'gen_clang_module.swift.response'
3636

3737
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
38-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
38+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
3939
// RUN: == -req=cursor -pos=3:11 %s -- %s -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
40-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK1 %s
40+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK1 %s
4141

4242
// CHECK1: source.lang.swift.ref.class ({{.*}}Foo.framework/Headers/Foo.h:147:12-147:24)
4343
// CHECK1: FooClassBase
@@ -46,7 +46,7 @@ var x: FooClassBase
4646
// CHECK1-NEXT: /<interface-gen>
4747

4848
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
49-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
49+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
5050
// RUN: == -req=cursor -pos=232:20 | %FileCheck -check-prefix=CHECK2 %s
5151
// The cursor points inside the interface, see 'gen_clang_module.swift.response'
5252

@@ -57,22 +57,22 @@ var x: FooClassBase
5757
// CHECK2-NEXT: /<interface-gen>
5858

5959
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
60-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
60+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
6161
// RUN: == -req=find-usr -usr "c:objc(cs)FooClassDerived(im)fooInstanceFunc0" | %FileCheck -check-prefix=CHECK-USR %s
6262
// The returned line:col points inside the interface, see 'gen_clang_module.swift.response'
6363

6464
// CHECK-USR: (232:15-232:33)
6565

6666
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
67-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
67+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
6868
// RUN: == -req=find-interface -module Foo -- %s -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
69-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-IFACE %s
69+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-IFACE %s
7070

7171
// CHECK-IFACE: DOC: (/<interface-gen>)
7272
// CHECK-IFACE: ARGS: [-target x86_64-{{.*}} -sdk {{.*}} -F {{.*}}/libIDE-mock-sdk -I {{.*}}.overlays {{.*}} -module-cache-path {{.*}} ]
7373

7474
// RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
75-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t \
75+
// RUN: -target %target-triple %clang-importer-sdk-nosource -I %t \
7676
// RUN: == -req=cursor -pos=1:8 == -req=cursor -pos=1:12 \
7777
// RUN: == -req=cursor -pos=2:10 \
7878
// RUN: == -req=cursor -pos=3:10 | %FileCheck -check-prefix=CHECK-IMPORT %s
@@ -92,8 +92,8 @@ var x: FooClassBase
9292
// CHECK-IMPORT-NEXT: FooHelper{{$}}
9393

9494
// RUN: %sourcekitd-test -req=interface-gen -module APINotesTests -- -swift-version 4 -F %S/Inputs/mock-sdk \
95-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource > %t.apinotes_swift3.response
95+
// RUN: -target %target-triple %clang-importer-sdk-nosource > %t.apinotes_swift3.response
9696
// RUN: diff -u %s.apinotes_swift3.response %t.apinotes_swift3.response
9797
// RUN: %sourcekitd-test -req=interface-gen -module APINotesTests -- -swift-version 5 -F %S/Inputs/mock-sdk \
98-
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource > %t.apinotes_swift4.response
98+
// RUN: -target %target-triple %clang-importer-sdk-nosource > %t.apinotes_swift4.response
9999
// RUN: diff -u %s.apinotes_swift4.response %t.apinotes_swift4.response

0 commit comments

Comments
 (0)