Skip to content

Commit 21c4e3a

Browse files
committed
Remove unnecessary platform-specific checks from tests
1 parent 269f1b9 commit 21c4e3a

File tree

3 files changed

+5
-49
lines changed

3 files changed

+5
-49
lines changed

test/Frontend/parseable_output.swift

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,9 @@
99
// CHECK-NEXT: "command": "{{.*[\\/]}}swift-frontend{{(\.exe)?}}{{.*}}-primary-file {{.*[\\/]}}parseable_output.swift -o {{.*[\\/]}}parseable_output.swift.tmp.out -emit-module -emit-module-path {{.*[\\/]}}parseable_output.swift.tmp.swiftmodule -frontend-parseable-output",
1010
// CHECK-NEXT: "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
1111
// CHECK-NEXT: "command_arguments": [
12-
// CHECK-NEXT: "-target",
13-
// CHECK-NEXT: "{{.*}}",
14-
// CHECK-NEXT: "-module-cache-path",
15-
// CHECK-NEXT: "{{.*[\\/]}}clang-module-cache",
16-
// CHECK-NEXT: "-sdk",
17-
// CHECK-NEXT: "{{.*}}.sdk",
18-
// CHECK-NEXT: "-swift-version",
19-
// CHECK-NEXT: "4",
20-
// CHECK-NEXT: "-ignore-module-source-info",
21-
// CHECK-NEXT: "-typo-correction-limit",
22-
// CHECK-NEXT: "10",
23-
// CHECK-NEXT: "-primary-file",
12+
// CHECK: "-primary-file",
2413
// CHECK-NEXT: "{{.*[\\/]}}parseable_output.swift",
25-
// CHECK-NEXT: "-o",
14+
// CHECK: "-o",
2615
// CHECK-NEXT: "{{.*[\\/]}}parseable_output.swift.tmp.out",
2716
// CHECK-NEXT: "-emit-module",
2817
// CHECK-NEXT: "-emit-module-path",

test/Frontend/parseable_output_batch.swift

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,7 @@
1313
// CHECK-NEXT: "command": "{{.*[\\/]}}swift-frontend{{(\.exe)?}}{{.*}}-primary-file {{.*[\\/]}}parseable_output_batch.swift -primary-file {{.*[\\/]}}test.swift -o {{.*[\\/]}}parseable_output_batch.swift.tmp.out -o test.tmp.out -module-name parseable_output_batch -emit-module -emit-module-path {{.*[\\/]}}parseable_output_batch.swift.tmp.swiftmodule -module-name test -emit-module -emit-module-path test.tmp.swiftmodule -frontend-parseable-output",
1414
// CHECK-NEXT: "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
1515
// CHECK-NEXT: "command_arguments": [
16-
// CHECK-NEXT: "-target",
17-
// CHECK-NEXT: "{{.*}}",
18-
// CHECK-NEXT: "-module-cache-path",
19-
// CHECK-NEXT: "{{.*[\\/]}}clang-module-cache",
20-
// CHECK-NEXT: "-sdk",
21-
// CHECK-NEXT: "{{.*}}.sdk",
22-
// CHECK-NEXT: "-swift-version",
23-
// CHECK-NEXT: "4",
24-
// CHECK-NEXT: "-ignore-module-source-info",
25-
// CHECK-NEXT: "-typo-correction-limit",
26-
// CHECK-NEXT: "10",
27-
// CHECK-NEXT: "-primary-file",
16+
// CHECK: "-primary-file",
2817
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_batch.swift",
2918
// CHECK-NEXT: "-primary-file",
3019
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_batch.swift.tmp\/test.swift",
@@ -70,18 +59,7 @@
7059
// CHECK-NEXT: "command": "{{.*[\\/]}}swift-frontend{{(\.exe)?}}{{.*}}-primary-file {{.*[\\/]}}parseable_output_batch.swift -primary-file {{.*[\\/]}}test.swift -o {{.*[\\/]}}parseable_output_batch.swift.tmp.out -o test.tmp.out -module-name parseable_output_batch -emit-module -emit-module-path {{.*[\\/]}}parseable_output_batch.swift.tmp.swiftmodule -module-name test -emit-module -emit-module-path test.tmp.swiftmodule -frontend-parseable-output",
7160
// CHECK-NEXT: "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
7261
// CHECK-NEXT: "command_arguments": [
73-
// CHECK-NEXT: "-target",
74-
// CHECK-NEXT: "{{.*}}",
75-
// CHECK-NEXT: "-module-cache-path",
76-
// CHECK-NEXT: "{{.*[\\/]}}clang-module-cache",
77-
// CHECK-NEXT: "-sdk",
78-
// CHECK-NEXT: "{{.*}}.sdk",
79-
// CHECK-NEXT: "-swift-version",
80-
// CHECK-NEXT: "4",
81-
// CHECK-NEXT: "-ignore-module-source-info",
82-
// CHECK-NEXT: "-typo-correction-limit",
83-
// CHECK-NEXT: "10",
84-
// CHECK-NEXT: "-primary-file",
62+
// CHECK: "-primary-file",
8563
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_batch.swift",
8664
// CHECK-NEXT: "-primary-file",
8765
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_batch.swift.tmp\/test.swift",

test/Frontend/parseable_output_error.swift

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,7 @@ func foo() {
1111
// CHECK-NEXT: "command": "{{.*[\\/]}}swift-frontend{{(\.exe)?}}{{.*}}-primary-file {{.*[\\/]}}parseable_output_error.swift -o {{.*[\\/]}}parseable_output_error.swift.tmp.out -emit-module -emit-module-path {{.*[\\/]}}parseable_output_error.swift.tmp.swiftmodule -frontend-parseable-output",
1212
// CHECK-NEXT: "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
1313
// CHECK-NEXT: "command_arguments": [
14-
// CHECK-NEXT: "-target",
15-
// CHECK-NEXT: "{{.*}}",
16-
// CHECK-NEXT: "-module-cache-path",
17-
// CHECK-NEXT: "{{.*[\\/]}}clang-module-cache",
18-
// CHECK-NEXT: "-sdk",
19-
// CHECK-NEXT: "{{.*}}.sdk",
20-
// CHECK-NEXT: "-swift-version",
21-
// CHECK-NEXT: "4",
22-
// CHECK-NEXT: "-ignore-module-source-info",
23-
// CHECK-NEXT: "-typo-correction-limit",
24-
// CHECK-NEXT: "10",
25-
// CHECK-NEXT: "-primary-file",
14+
// CHECK: "-primary-file",
2615
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_error.swift",
2716
// CHECK-NEXT: "-o",
2817
// CHECK-NEXT: "{{.*[\\/]}}parseable_output_error.swift.tmp.out",

0 commit comments

Comments
 (0)