Skip to content

Commit c035333

Browse files
benlangmuirbenlangmuir
authored
Merge pull request swiftlang#14366 from benlangmuir/sourcekit-driver
[sourcekit] Use the driver to parse command line arguments
2 parents 12da08d + 72bde68 commit c035333

34 files changed

+397
-294
lines changed

‎test/SourceKit/CodeComplete/complete_crash1.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// XFAIL: broken_std_regex
2-
// RUN: %complete-test -tok=TOK1 -hide-none %s -- %s
2+
// RUN: %complete-test -tok=TOK1 -hide-none %s
33

44
import QuartzCore
55

‎test/SourceKit/CodeComplete/complete_import_module_flag.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// XFAIL: broken_std_regex
22
// RUN: %empty-directory(%t)
33
// RUN: %swift -Xcc -I%S/Inputs -emit-module -o %t/auxiliary_file.swiftmodule %S/Inputs/auxiliary_file.swift
4-
// RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | %FileCheck %s
5-
// RUN: %complete-test -group=none -tok=TOP_LEVEL_0 %s -- -import-module auxiliary_file -I %t -I %S/Inputs | %FileCheck %s -check-prefix=WITH_HIDING
4+
// RUN: %complete-test -group=none -hide-none -raw -tok=TOP_LEVEL_0 %s -- -Xfrontend -import-module -Xfrontend auxiliary_file -I %t -I %S/Inputs | %FileCheck %s
5+
// RUN: %complete-test -group=none -tok=TOP_LEVEL_0 %s -- -Xfrontend -import-module -Xfrontend auxiliary_file -I %t -I %S/Inputs | %FileCheck %s -check-prefix=WITH_HIDING
66

77
func fromMainModule() {}
88
func test() {

‎test/SourceKit/CursorInfo/cursor_info_async.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import Foo
22

33
// REQUIRES: objc_interop
44

5+
// RUN: %empty-directory(%t)
6+
// RUN: %build-clang-importer-objc-overlays
7+
58
// Perform 8 concurrent cursor infos, which is often enough to cause
69
// contention. We disable printing the requests to minimize delay.
710

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

‎test/SourceKit/CursorInfo/cursor_stdlib.swift

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,53 @@ import Swift
2222
func foo3(a: Float, b: Bool) {}
2323

2424
// REQUIRES: objc_interop
25-
// RUN: %sourcekitd-test -req=cursor -pos=3:18 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-OVERLAY %s
25+
26+
// RUN: %empty-directory(%t)
27+
// RUN: %build-clang-importer-objc-overlays
28+
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
2630
// CHECK-OVERLAY: source.lang.swift.ref.var.global
2731
// CHECK-OVERLAY-NEXT: NSUTF8StringEncoding
2832
// CHECK-OVERLAY-NEXT: s:10Foundation20NSUTF8StringEncodingSuv
2933
// CHECK-OVERLAY-NEXT: UInt
3034
// CHECK-OVERLAY-NEXT: $SSuD
31-
// CHECK-OVERLAY-NEXT: <Declaration>public let NSUTF8StringEncoding: <Type usr="s:Su">UInt</Type></Declaration>
35+
// CHECK-OVERLAY-NEXT: Foundation
36+
// CHECK-OVERLAY-NEXT: SYSTEM
37+
// CHECK-OVERLAY-NEXT: <Declaration>let NSUTF8StringEncoding: <Type usr="s:Su">UInt</Type></Declaration>
3238

33-
// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-ITERATOR %s
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
3440
// CHECK-ITERATOR-NOT: _AnyIteratorBase
3541
// CHECK-ITERATOR: <Group>Collection/Type-erased</Group>
3642

37-
// RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT1 %s
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
3844
// CHECK-REPLACEMENT1: <Group>Collection/Array</Group>
3945
// CHECK-REPLACEMENT1: <Declaration>{{.*}}func sorted() -&gt; [<Type usr="s:Si">Int</Type>]</Declaration>
4046
// CHECK-REPLACEMENT1: RELATED BEGIN
4147
// CHECK-REPLACEMENT1: sorted(by:)</RelatedName>
4248
// CHECK-REPLACEMENT1: RELATED END
4349

44-
// RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT2 %s
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
4551
// CHECK-REPLACEMENT2: <Group>Collection/Array</Group>
4652
// CHECK-REPLACEMENT2: <Declaration>{{.*}}mutating func append(_ newElement: <Type usr="s:Si">Int</Type>)</Declaration>
4753

48-
// RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT3 %s
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
4955
// CHECK-REPLACEMENT3: <Group>Collection/Array</Group>
5056
// CHECK-REPLACEMENT3: func sorted(by areInIncreasingOrder: (<Type usr="s:13cursor_stdlib2S1V">S1</Type>
5157
// CHECK-REPLACEMENT3: sorted()</RelatedName>
5258

53-
// RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-REPLACEMENT4 %s
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
5460
// CHECK-REPLACEMENT4: <Group>Collection/Array</Group>
5561
// CHECK-REPLACEMENT4: <Declaration>{{.*}}mutating func append(_ newElement: <Type usr="s:13cursor_stdlib2S1V">S1</Type>)</Declaration>
5662

57-
// RUN: %sourcekitd-test -req=cursor -pos=21:10 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-MODULE-GROUP1 %s
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
5864
// CHECK-MODULE-GROUP1: MODULE GROUPS BEGIN
5965
// CHECK-MODULE-GROUP1-DAG: Math
6066
// CHECK-MODULE-GROUP1-DAG: Collection
6167
// CHECK-MODULE-GROUP1-DAG: Collection/Array
6268
// CHECK-MODULE-GROUP1: MODULE GROUPS END
6369

64-
// RUN: %sourcekitd-test -req=cursor -pos=22:17 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-FLOAT1 %s
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
6571
// CHECK-FLOAT1: s:Sf
6672

67-
// RUN: %sourcekitd-test -req=cursor -pos=22:25 %s -- %s %mcp_opt %clang-importer-sdk | %FileCheck -check-prefix=CHECK-BOOL1 %s
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
6874
// CHECK-BOOL1: s:Sb

‎test/SourceKit/CursorInfo/rdar_18677108-2.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// RUN: %sourcekitd-test -req=open %S/Inputs/rdar_18677108-2-a.swift \
22
// RUN: -- %S/Inputs/rdar_18677108-2-b.swift \
33
// RUN: %S/Inputs/rdar_18677108-2-a.swift \
4-
// RUN: -primary-file %S/Inputs/rdar_18677108-2-a.swift \
54
// RUN: == -req=print-diags %S/Inputs/rdar_18677108-2-a.swift | %sed_clean > %t.response
65
// RUN: diff -u %s.response %t.response
76

‎test/SourceKit/DocSupport/doc_clang_module.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
// REQUIRES: objc_interop
2+
3+
// FIXME: the test output we're comparing to is specific to macOS.
4+
// REQUIRES-ANY: OS=macosx
5+
6+
// RUN: %empty-directory(%t)
7+
// RUN: %build-clang-importer-objc-overlays
8+
29
// RUN: %sourcekitd-test -req=doc-info -module Foo -- -F %S/../Inputs/libIDE-mock-sdk \
3-
// RUN: %mcp_opt %clang-importer-sdk | %sed_clean > %t.response
10+
// RUN: %mcp_opt -target %target-triple %clang-importer-sdk-nosource -I %t | %sed_clean > %t.response
411
// RUN: diff -u %s.response %t.response

‎test/SourceKit/DocSupport/doc_source_file.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
// RUN: %sourcekitd-test -req=doc-info %S/Inputs/main.swift > %t.response
22
// RUN: diff -u %s.response %t.response
3+
4+
// RUN: not %sourcekitd-test -req=doc-info %S/Inputs/main.swift -- %S/Inputs/cake.swift 2> %t.error
5+
// RUN: %FileCheck %s -check-prefix=MULTI_FILE < %t.error
6+
7+
// MULTI_FILE: unexpected input in compiler arguments

0 commit comments

Comments
 (0)