Skip to content

Commit 20cbf65

Browse files
author
David Ungar
committed
Changes only for syntax.
1 parent a5a826c commit 20cbf65

6 files changed

+140
-133
lines changed

‎test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json 2>&1 | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s
2222
// CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled{{.*}}inputs
23-
// CHECK-INPUTS-MISMATCH: ./other.swift
23+
// CHECK-INPUTS-MISMATCH: {{(./)?}}other.swift
2424
// CHECK-INPUTS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift}

‎test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
// RUN: touch -t 201401240006 %t/other.swift
1616
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
1717
// CHECK-THIRD: Queuing (initial): {compile: other.o <= other.swift}
18-
// CHECK-THIRD: Queuing because of the initial set: {compile: main.o <= main.swift}
19-
// CHECK-THIRD-NEXT: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps
18+
// CHECK-THIRD-DAG: Queuing because of the initial set: {compile: main.o <= main.swift}
19+
// CHECK-THIRD-DAG: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps

‎test/Driver/Dependencies/embed-bitcode-parallel-fine.swift

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,88 +4,95 @@
44
// RUN: cp -r %S/Inputs/one-way-fine/* %t
55
// RUN: touch -t 201401240005 %t/*
66

7-
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
7+
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output >%t/first.json 2>&1
8+
9+
// RUN: %FileCheck -check-prefix=CHECK-FIRST %s <%t/first.json
10+
// RUN: %FileCheck -check-prefix=CHECK-FIRST %s <%t/first.json
11+
// RUN: %FileCheck -check-prefix=CHECK-FIRST %s <%t/first.json
12+
// RUN: %FileCheck -check-prefix=CHECK-FIRST %s <%t/first.json
13+
// RUN: %FileCheck -check-prefix=CHECK-FIRST %s <%t/first.json
814

915
// CHECK-FIRST-NOT: warning
16+
1017
// CHECK-FIRST: {{^{$}}
11-
// CHECK-FIRST: "kind": "began"
12-
// CHECK-FIRST: "name": "compile"
13-
// CHECK-FIRST: ".\/main.swift"
18+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "began"
19+
// CHECK-FIRST-DAG: "name"{{ ?}}: "compile"
20+
// CHECK-FIRST-DAG: "{{(.\\/)?}}main.swift"
1421
// CHECK-FIRST: {{^}$}}
1522

1623
// CHECK-FIRST: {{^{$}}
17-
// CHECK-FIRST: "kind": "finished"
18-
// CHECK-FIRST: "name": "compile"
19-
// CHECK-FIRST: "output": "Handled main.swift\n"
24+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "finished"
25+
// CHECK-FIRST-DAG: "name"{{ ?}}: "compile"
26+
// CHECK-FIRST-DAG: "output"{{ ?}}: "Handled main.swift\n"
2027
// CHECK-FIRST: {{^}$}}
2128

2229
// CHECK-FIRST: {{^{$}}
23-
// CHECK-FIRST: "kind": "began"
24-
// CHECK-FIRST: "name": "compile"
25-
// CHECK-FIRST: ".\/other.swift"
30+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "began"
31+
// CHECK-FIRST-DAG: "name"{{ ?}}: "compile"
32+
// CHECK-FIRST-DAG: "{{(.\\/)?}}other.swift"
2633
// CHECK-FIRST: {{^}$}}
2734

2835
// CHECK-FIRST: {{^{$}}
29-
// CHECK-FIRST: "kind": "finished"
30-
// CHECK-FIRST: "name": "compile"
31-
// CHECK-FIRST: "output": "Handled other.swift\n"
36+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "finished"
37+
// CHECK-FIRST-DAG: "name"{{ ?}}: "compile"
38+
// CHECK-FIRST-DAG: "output"{{ ?}}: "Handled other.swift\n"
3239
// CHECK-FIRST: {{^}$}}
3340

3441
// CHECK-FIRST: {{^{$}}
35-
// CHECK-FIRST: "kind": "began"
36-
// CHECK-FIRST: "name": "backend"
37-
// CHECK-FIRST: ".\/main.o"
42+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "began"
43+
// CHECK-FIRST-DAG: "name"{{ ?}}: "backend"
44+
// CHECK-FIRST-DAG: "{{(.\\/)?}}main.o"
3845
// CHECK-FIRST: {{^}$}}
3946

4047
// CHECK-FIRST: {{^{$}}
41-
// CHECK-FIRST: "kind": "finished"
42-
// CHECK-FIRST: "name": "backend"
43-
// CHECK-FIRST: "output": "Produced main.o\n"
48+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "finished"
49+
// CHECK-FIRST-DAG: "name"{{ ?}}: "backend"
50+
// CHECK-FIRST-DAG: "output"{{ ?}}: "Produced main.o\n"
4451
// CHECK-FIRST: {{^}$}}
4552

4653
// CHECK-FIRST: {{^{$}}
47-
// CHECK-FIRST: "kind": "began"
48-
// CHECK-FIRST: "name": "backend"
49-
// CHECK-FIRST: ".\/other.o"
54+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "began"
55+
// CHECK-FIRST-DAG: "name"{{ ?}}: "backend"
56+
// CHECK-FIRST-DAG: "{{(.\\/)?}}other.o"
5057
// CHECK-FIRST: {{^}$}}
5158

5259
// CHECK-FIRST: {{^{$}}
53-
// CHECK-FIRST: "kind": "finished"
54-
// CHECK-FIRST: "name": "backend"
55-
// CHECK-FIRST: "output": "Produced other.o\n"
60+
// CHECK-FIRST-DAT: "kind"{{ ?}}: "finished"
61+
// CHECK-FIRST-DAT: "name"{{ ?}}: "backend"
62+
// CHECK-FIRST-DAT: "output"{{ ?}}: "Produced other.o\n"
5663
// CHECK-FIRST: {{^}$}}
5764

5865

5966
// RUN: touch -t 201401240006 %t/other.swift
6067
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
6168

62-
// CHECK-SECOND: "kind": "began"
63-
// CHECK-SECOND: "name": "compile"
64-
// CHECK-SECOND: ".\/main.swift"
69+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "began"
70+
// CHECK-SECOND-DAG: "name"{{ ?}}: "compile"
71+
// CHECK-SECOND-DAG: "{{(.\\/)?}}main.swift"
6572
// CHECK-SECOND: {{^}$}}
6673

6774
// CHECK-SECOND-NOT: finished
6875

69-
// CHECK-SECOND: "kind": "began"
70-
// CHECK-SECOND: "name": "compile"
71-
// CHECK-SECOND: ".\/other.swift"
76+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "began"
77+
// CHECK-SECOND-DAG: "name"{{ ?}}: "compile"
78+
// CHECK-SECOND-DAG: "{{(.\\/)?}}other.swift"
7279
// CHECK-SECOND: {{^}$}}
7380

7481
// CHECK-SECOND-NOT: began
7582

76-
// CHECK-SECOND: "kind": "finished"
77-
// CHECK-SECOND: "name": "compile"
78-
// CHECK-SECOND: "output": "Handled {{other.swift|main.swift}}\n"
83+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "finished"
84+
// CHECK-SECOND-DAG: "name"{{ ?}}: "compile"
85+
// CHECK-SECOND-DAG: "output"{{ ?}}: "Handled {{other.swift|main.swift}}\n"
7986
// CHECK-SECOND: {{^}$}}
8087

81-
// CHECK-SECOND: "kind": "began"
82-
// CHECK-SECOND: "name": "backend"
83-
// CHECK-SECOND: ".\/{{other.o|main.o}}"
88+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "began"
89+
// CHECK-SECOND-DAG: "name"{{ ?}}: "backend"
90+
// CHECK-SECOND-DAG: "{{(.\\/)?}}{{other.o|main.o}}"
8491
// CHECK-SECOND: {{^}$}}
8592

86-
// CHECK-SECOND: "kind": "finished"
87-
// CHECK-SECOND: "name": "backend"
88-
// CHECK-SECOND: "output": "Produced {{other.o|main.o}}\n"
93+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "finished"
94+
// CHECK-SECOND-DAG: "name"{{ ?}}: "backend"
95+
// CHECK-SECOND-DAG: "output"{{ ?}}: "Produced {{other.o|main.o}}\n"
8996
// CHECK-SECOND: {{^}$}}
9097

9198
// CHECK-SECOND-NOT: "skipped"

‎test/Driver/Dependencies/independent-parseable-fine.swift

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
// CHECK-FIRST-NOT: warning
88
// CHECK-FIRST: {{^{$}}
9-
// CHECK-FIRST: "kind": "began"
10-
// CHECK-FIRST: "name": "compile"
11-
// CHECK-FIRST: ".\/main.swift"
9+
// CHECK-FIRST-DAG: "kind"{{ ?}}: "began"
10+
// CHECK-FIRST-DAG: "name"{{ ?}}: "compile"
11+
// CHECK-FIRST-DAG: "{{(.\\/)?}}main.swift"
1212
// CHECK-FIRST: {{^}$}}
1313

1414
// CHECK-FIRST: {{^{$}}
15-
// CHECK-FIRST: "kind": "finished"
16-
// CHECK-FIRST: "name": "compile"
17-
// CHECK-FIRST: "output": "Handled main.swift{{(\\r)?}}\n"
15+
// CHECK-FIRST: "kind"{{ ?}}: "finished"
16+
// CHECK-FIRST: "name"{{ ?}}: "compile"
17+
// CHECK-FIRST: "output"{{ ?}}: "Handled main.swift{{(\\r)?}}\n"
1818
// CHECK-FIRST: {{^}$}}
1919

2020
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
2121

2222
// CHECK-SECOND: {{^{$}}
23-
// CHECK-SECOND: "kind": "skipped"
24-
// CHECK-SECOND: "name": "compile"
25-
// CHECK-SECOND: ".\/main.swift"
23+
// CHECK-SECOND-DAG: "kind"{{ ?}}: "skipped"
24+
// CHECK-SECOND-DAG: "name"{{ ?}}: "compile"
25+
// CHECK-SECOND-DAG: "{{(.\\/)?}}main.swift"
2626
// CHECK-SECOND: {{^}$}}
2727

2828
// RUN: touch -t 201401240006 %t/*
@@ -36,41 +36,41 @@
3636
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
3737

3838
// CHECK-FIRST-MULTI: {{^{$}}
39-
// CHECK-FIRST-MULTI: "kind": "began"
40-
// CHECK-FIRST-MULTI: "name": "compile"
41-
// CHECK-FIRST-MULTI: ".\/main.swift"
39+
// CHECK-FIRST-MULTI-DAG: "kind"{{ ?}}: "began"
40+
// CHECK-FIRST-MULTI-DAG: "name"{{ ?}}: "compile"
41+
// CHECK-FIRST-MULTI-DAG: "{{(.\\/)?}}main.swift"
4242
// CHECK-FIRST-MULTI: {{^}$}}
4343

4444
// CHECK-FIRST-MULTI: {{^{$}}
45-
// CHECK-FIRST-MULTI: "kind": "finished"
46-
// CHECK-FIRST-MULTI: "name": "compile"
47-
// CHECK-FIRST-MULTI: "output": "Handled main.swift{{(\\r)?}}\n"
45+
// CHECK-FIRST-MULTI-DAG: "kind"{{ ?}}: "finished"
46+
// CHECK-FIRST-MULTI-DAG: "name"{{ ?}}: "compile"
47+
// CHECK-FIRST-MULTI-DAG: "output"{{ ?}}: "Handled main.swift{{(\\r)?}}\n"
4848
// CHECK-FIRST-MULTI: {{^}$}}
4949

5050
// CHECK-FIRST-MULTI: {{^{$}}
51-
// CHECK-FIRST-MULTI: "kind": "began"
52-
// CHECK-FIRST-MULTI: "name": "compile"
53-
// CHECK-FIRST-MULTI: ".\/other.swift"
51+
// CHECK-FIRST-MULTI-DAG: "kind"{{ ?}}: "began"
52+
// CHECK-FIRST-MULTI-DAG: "name"{{ ?}}: "compile"
53+
// CHECK-FIRST-MULTI-DAG: "{{(.\\/)?}}other.swift"
5454
// CHECK-FIRST-MULTI: {{^}$}}
5555

5656
// CHECK-FIRST-MULTI: {{^{$}}
57-
// CHECK-FIRST-MULTI: "kind": "finished"
58-
// CHECK-FIRST-MULTI: "name": "compile"
59-
// CHECK-FIRST-MULTI: "output": "Handled other.swift{{(\\r)?}}\n"
57+
// CHECK-FIRST-MULTI-DAG: "kind"{{ ?}}: "finished"
58+
// CHECK-FIRST-MULTI-DAG: "name"{{ ?}}: "compile"
59+
// CHECK-FIRST-MULTI-DAG: "output"{{ ?}}: "Handled other.swift{{(\\r)?}}\n"
6060
// CHECK-FIRST-MULTI: {{^}$}}
6161

6262
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s
6363

6464
// CHECK-SECOND-MULTI: {{^{$}}
65-
// CHECK-SECOND-MULTI: "kind": "skipped"
66-
// CHECK-SECOND-MULTI: "name": "compile"
67-
// CHECK-SECOND-MULTI: ".\/main.swift"
65+
// CHECK-SECOND-MULTI-DAG: "kind"{{ ?}}: "skipped"
66+
// CHECK-SECOND-MULTI-DAG: "name"{{ ?}}: "compile"
67+
// CHECK-SECOND-MULTI-DAG: "{{(.\\/)?}}main.swift"
6868
// CHECK-SECOND-MULTI: {{^}$}}
6969

7070
// CHECK-SECOND-MULTI: {{^{$}}
71-
// CHECK-SECOND-MULTI: "kind": "skipped"
72-
// CHECK-SECOND-MULTI: "name": "compile"
73-
// CHECK-SECOND-MULTI: ".\/other.swift"
71+
// CHECK-SECOND-MULTI-DAG: "kind"{{ ?}}: "skipped"
72+
// CHECK-SECOND-MULTI-DAG: "name"{{ ?}}: "compile"
73+
// CHECK-SECOND-MULTI-DAG: "{{(.\\/)?}}other.swift"
7474
// CHECK-SECOND-MULTI: {{^}$}}
7575

7676
// RUN: touch -t 201401240006 %t/*

‎test/Driver/Dependencies/one-way-parallel-fine.swift

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,54 @@
88

99
// CHECK-FIRST-NOT: warning
1010
// CHECK-FIRST: {{^{$}}
11-
// CHECK-FIRST: "kind": "began"
12-
// CHECK-FIRST: "name": "compile"
13-
// CHECK-FIRST: ".\/main.swift"
11+
// CHECK-FIRST-DAG: "kind"{{ *}}: "began"
12+
// CHECK-FIRST-DAG: "name"{{ *}}: "compile"
13+
// CHECK-FIRST-DAG: "{{(.\\/)?}}main.swift"
1414
// CHECK-FIRST: {{^}$}}
1515

1616
// CHECK-FIRST: {{^{$}}
17-
// CHECK-FIRST: "kind": "finished"
18-
// CHECK-FIRST: "name": "compile"
19-
// CHECK-FIRST: "output": "Handled main.swift\n"
17+
// CHECK-FIRST-DAG: "kind"{{ *}}: "finished"
18+
// CHECK-FIRST-DAG: "name"{{ *}}: "compile"
19+
// CHECK-FIRST-DAG: "output"{{ *}}: "Handled main.swift\n"
2020
// CHECK-FIRST: {{^}$}}
2121

2222
// CHECK-FIRST: {{^{$}}
23-
// CHECK-FIRST: "kind": "began"
24-
// CHECK-FIRST: "name": "compile"
25-
// CHECK-FIRST: ".\/other.swift"
23+
// CHECK-FIRST-DAG: "kind"{{ *}}: "began"
24+
// CHECK-FIRST-DAG: "name"{{ *}}: "compile"
25+
// CHECK-FIRST-DAG: "{{(.\\/)?}}other.swift"
2626
// CHECK-FIRST: {{^}$}}
2727

2828
// CHECK-FIRST: {{^{$}}
29-
// CHECK-FIRST: "kind": "finished"
30-
// CHECK-FIRST: "name": "compile"
31-
// CHECK-FIRST: "output": "Handled other.swift\n"
29+
// CHECK-FIRST-DAG: "kind"{{ *}}: "finished"
30+
// CHECK-FIRST-DAG: "name"{{ *}}: "compile"
31+
// CHECK-FIRST-DAG: "output"{{ *}}: "Handled other.swift\n"
3232
// CHECK-FIRST: {{^}$}}
3333

3434
// RUN: touch -t 201401240006 %t/other.swift
3535
// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
3636

3737
// CHECK-SECOND: {{^{$}}
38-
// CHECK-SECOND: "kind": "began"
39-
// CHECK-SECOND: "name": "compile"
40-
// CHECK-SECOND: ".\/other.swift"
38+
// CHECK-SECOND-DAG: "kind"{{ *}}: "began"
39+
// CHECK-SECOND-DAG: "name"{{ *}}: "compile"
40+
// CHECK-SECOND-DAG: "{{(.\\/)?}}other.swift"
4141
// CHECK-SECOND: {{^}$}}
4242

4343
// CHECK-SECOND: {{^{$}}
44-
// CHECK-SECOND: "kind": "began"
45-
// CHECK-SECOND: "name": "compile"
46-
// CHECK-SECOND: ".\/main.swift"
44+
// CHECK-SECOND-DAG: "kind"{{ *}}: "began"
45+
// CHECK-SECOND-DAG: "name"{{ *}}: "compile"
46+
// CHECK-SECOND-DAG: "{{(.\\/)?}}main.swift"
4747
// CHECK-SECOND: {{^}$}}
4848

4949
// CHECK-SECOND: {{^{$}}
50-
// CHECK-SECOND: "kind": "finished"
51-
// CHECK-SECOND: "name": "compile"
52-
// CHECK-SECOND: "output": "Handled {{other.swift|main.swift}}\n"
50+
// CHECK-SECOND-DAG: "kind"{{ *}}: "finished"
51+
// CHECK-SECOND-DAG: "name"{{ *}}: "compile"
52+
// CHECK-SECOND-DAG: "output"{{ *}}: "Handled {{other.swift|main.swift}}\n"
5353
// CHECK-SECOND: {{^}$}}
5454

5555
// CHECK-SECOND: {{^{$}}
56-
// CHECK-SECOND: "kind": "finished"
57-
// CHECK-SECOND: "name": "compile"
58-
// CHECK-SECOND: "output": "Handled {{main.swift|other.swift}}\n"
56+
// CHECK-SECOND-DAG: "kind"{{ *}}: "finished"
57+
// CHECK-SECOND-DAG: "name"{{ *}}: "compile"
58+
// CHECK-SECOND-DAG: "output"{{ *}}: "Handled {{main.swift|other.swift}}\n"
5959
// CHECK-SECOND: {{^}$}}
6060

6161
// CHECK-SECOND-NOT: "skipped"

0 commit comments

Comments
 (0)