Skip to content

Commit 332569a

Browse files
author
David Ungar
authored
Merge pull request swiftlang#35053 from davidungar/fixing-tests
[swift-driver] Make checked build-record paths in many tests insensitive to ./ prefix
2 parents 1eb810f + a2b4568 commit 332569a

10 files changed

+51
-51
lines changed

‎test/Driver/Dependencies/check-interface-implementation-fine.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// CHECK-FIRST: Handled c.swift
1515
// CHECK-FIRST: Handled bad.swift
1616

17-
// CHECK-RECORD-CLEAN-DAG: "./a.swift": [
18-
// CHECK-RECORD-CLEAN-DAG: "./bad.swift": [
19-
// CHECK-RECORD-CLEAN-DAG: "./c.swift": [
17+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}a.swift": [
18+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}bad.swift": [
19+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}c.swift": [
2020

2121

2222
// RUN: touch -t 201401240006 %t/a.swift
@@ -29,9 +29,9 @@
2929
// CHECK-A: Handled bad.swift
3030
// NEGATIVE-A-NOT: Handled c.swift
3131

32-
// CHECK-RECORD-A-DAG: "./a.swift": [
33-
// CHECK-RECORD-A-DAG: "./bad.swift": !private [
34-
// CHECK-RECORD-A-DAG: "./c.swift": !private [
32+
// CHECK-RECORD-A-DAG: "{{(./)?}}a.swift": [
33+
// CHECK-RECORD-A-DAG: "{{(./)?}}bad.swift": !private [
34+
// CHECK-RECORD-A-DAG: "{{(./)?}}c.swift": !private [
3535

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 ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s
3737

‎test/Driver/Dependencies/crash-added-fine.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
// CHECK-ADDED: Handled crash.swift
1818
// CHECK-ADDED-NOT: Handled
1919

20-
// CHECK-RECORD-ADDED-DAG: "./crash.swift": !private [
21-
// CHECK-RECORD-ADDED-DAG: "./main.swift": [
22-
// CHECK-RECORD-ADDED-DAG: "./other.swift": [
20+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}crash.swift": !private [
21+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}main.swift": [
22+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}other.swift": [
2323

2424

2525
// RUN: %empty-directory(%t)

‎test/Driver/Dependencies/crash-simple-fine.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
// RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
2222

23-
// CHECK-RECORD-DAG: "./crash.swift": !private [
24-
// CHECK-RECORD-DAG: "./main.swift": !private [
25-
// CHECK-RECORD-DAG: "./other.swift": !private [
23+
// CHECK-RECORD-DAG: "{{(./)?}}crash.swift": !private [
24+
// CHECK-RECORD-DAG: "{{(./)?}}main.swift": !private [
25+
// CHECK-RECORD-DAG: "{{(./)?}}other.swift": !private [
2626

2727
// 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 ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
2828

‎test/Driver/Dependencies/dependencies-preservation-fine.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
// CHECK-OVERWRITTEN: options: "{{.*}}"
1717
// CHECK-OVERWRITTEN: build_time: [{{[0-9]*}}, {{[0-9]*}}]
1818
// CHECK-OVERWRITTEN: inputs:
19-
// CHECK-OVERWRITTEN: "./main.swift": [443865900, 0]
20-
// CHECK-OVERWRITTEN: "./other.swift": [443865900, 0]
19+
// CHECK-OVERWRITTEN: "{{(./)?}}main.swift": [443865900, 0]
20+
// CHECK-OVERWRITTEN: "{{(./)?}}other.swift": [443865900, 0]

‎test/Driver/Dependencies/fail-added-fine.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
// CHECK-ADDED: Handled bad.swift
1818
// CHECK-ADDED-NOT: Handled
1919

20-
// CHECK-RECORD-ADDED-DAG: "./bad.swift": !private [
21-
// CHECK-RECORD-ADDED-DAG: "./main.swift": [
22-
// CHECK-RECORD-ADDED-DAG: "./other.swift": [
20+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}bad.swift": !private [
21+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}main.swift": [
22+
// CHECK-RECORD-ADDED-DAG: "{{(./)?}}other.swift": [
2323

2424

2525
// RUN: %empty-directory(%t)

‎test/Driver/Dependencies/fail-chained-fine.swift‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
// CHECK-FIRST: Handled f.swift
1717
// CHECK-FIRST: Handled bad.swift
1818

19-
// CHECK-RECORD-CLEAN-DAG: "./a.swift": [
20-
// CHECK-RECORD-CLEAN-DAG: "./b.swift": [
21-
// CHECK-RECORD-CLEAN-DAG: "./c.swift": [
22-
// CHECK-RECORD-CLEAN-DAG: "./d.swift": [
23-
// CHECK-RECORD-CLEAN-DAG: "./e.swift": [
24-
// CHECK-RECORD-CLEAN-DAG: "./f.swift": [
25-
// CHECK-RECORD-CLEAN-DAG: "./bad.swift": [
19+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}a.swift": [
20+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}b.swift": [
21+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}c.swift": [
22+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}d.swift": [
23+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}e.swift": [
24+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}f.swift": [
25+
// CHECK-RECORD-CLEAN-DAG: "{{(./)?}}bad.swift": [
2626

2727

2828
// RUN: touch -t 201401240006 %t/a.swift
@@ -39,13 +39,13 @@
3939
// NEGATIVE-A-NOT: Handled e.swift
4040
// NEGATIVE-A-NOT: Handled f.swift
4141

42-
// CHECK-RECORD-A-DAG: "./a.swift": [
43-
// CHECK-RECORD-A-DAG: "./b.swift": [
44-
// CHECK-RECORD-A-DAG: "./c.swift": !private [
45-
// CHECK-RECORD-A-DAG: "./d.swift": !private [
46-
// CHECK-RECORD-A-DAG: "./e.swift": !private [
47-
// CHECK-RECORD-A-DAG: "./f.swift": [
48-
// CHECK-RECORD-A-DAG: "./bad.swift": !private [
42+
// CHECK-RECORD-A-DAG: "{{(./)?}}a.swift": [
43+
// CHECK-RECORD-A-DAG: "{{(./)?}}b.swift": [
44+
// CHECK-RECORD-A-DAG: "{{(./)?}}c.swift": !private [
45+
// CHECK-RECORD-A-DAG: "{{(./)?}}d.swift": !private [
46+
// CHECK-RECORD-A-DAG: "{{(./)?}}e.swift": !private [
47+
// CHECK-RECORD-A-DAG: "{{(./)?}}f.swift": [
48+
// CHECK-RECORD-A-DAG: "{{(./)?}}bad.swift": !private [
4949

5050
// 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 ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
5151
// RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt
@@ -81,13 +81,13 @@
8181
// NEGATIVE-B-NOT: Handled e.swift
8282
// NEGATIVE-B-NOT: Handled f.swift
8383

84-
// CHECK-RECORD-B-DAG: "./a.swift": [
85-
// CHECK-RECORD-B-DAG: "./b.swift": [
86-
// CHECK-RECORD-B-DAG: "./c.swift": [
87-
// CHECK-RECORD-B-DAG: "./d.swift": [
88-
// CHECK-RECORD-B-DAG: "./e.swift": [
89-
// CHECK-RECORD-B-DAG: "./f.swift": [
90-
// CHECK-RECORD-B-DAG: "./bad.swift": !private [
84+
// CHECK-RECORD-B-DAG: "{{(./)?}}a.swift": [
85+
// CHECK-RECORD-B-DAG: "{{(./)?}}b.swift": [
86+
// CHECK-RECORD-B-DAG: "{{(./)?}}c.swift": [
87+
// CHECK-RECORD-B-DAG: "{{(./)?}}d.swift": [
88+
// CHECK-RECORD-B-DAG: "{{(./)?}}e.swift": [
89+
// CHECK-RECORD-B-DAG: "{{(./)?}}f.swift": [
90+
// CHECK-RECORD-B-DAG: "{{(./)?}}bad.swift": !private [
9191

9292
// 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 ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
9393
// RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt

‎test/Driver/Dependencies/fail-interface-hash-fine.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
// CHECK-SECOND: Handled bad.swift
2525
// CHECK-SECOND-NOT: Handled depends
2626

27-
// CHECK-RECORD-DAG: "./bad.swift": !private [
28-
// CHECK-RECORD-DAG: "./main.swift": [
29-
// CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
30-
// CHECK-RECORD-DAG: "./depends-on-bad.swift": [
27+
// CHECK-RECORD-DAG: "{{(./)?}}bad.swift": !private [
28+
// CHECK-RECORD-DAG: "{{(./)?}}main.swift": [
29+
// CHECK-RECORD-DAG: "{{(./)?}}depends-on-main.swift": !private [
30+
// CHECK-RECORD-DAG: "{{(./)?}}depends-on-bad.swift": [
3131

3232
// 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 ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
3333

‎test/Driver/Dependencies/fail-simple-fine.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
// CHECK-SECOND-NOT: Handled main.swift
2020
// CHECK-SECOND-NOT: Handled other.swift
2121

22-
// CHECK-RECORD-DAG: "./bad.swift": !private [
23-
// CHECK-RECORD-DAG: "./main.swift": !private [
24-
// CHECK-RECORD-DAG: "./other.swift": !private [
22+
// CHECK-RECORD-DAG: "{{(./)?}}bad.swift": !private [
23+
// CHECK-RECORD-DAG: "{{(./)?}}main.swift": !private [
24+
// CHECK-RECORD-DAG: "{{(./)?}}other.swift": !private [
2525

2626
// 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 ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
2727

‎test/Driver/Dependencies/fail-with-bad-deps-fine.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
// CHECK-WITH-FAIL: Handled bad.swift
4343
// CHECK-WITH-FAIL-NOT: Handled depends
4444

45-
// CHECK-RECORD-DAG: "./bad.swift": !private [
46-
// CHECK-RECORD-DAG: "./main.swift": [
47-
// CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
48-
// CHECK-RECORD-DAG: "./depends-on-bad.swift": [
45+
// CHECK-RECORD-DAG: "{{(./)?}}bad.swift": !private [
46+
// CHECK-RECORD-DAG: "{{(./)?}}main.swift": [
47+
// CHECK-RECORD-DAG: "{{(./)?}}depends-on-main.swift": !private [
48+
// CHECK-RECORD-DAG: "{{(./)?}}depends-on-bad.swift": [
4949

5050
// 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 ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s

‎test/Driver/Dependencies/whole-module-build-record.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// CHECK-FIRST-NOT: warning
1111
// CHECK-FIRST: Produced main.o
1212

13-
// CHECK-RECORD-DAG: "./main.swift": [
14-
// CHECK-RECORD-DAG: "./other.swift": [
13+
// CHECK-RECORD-DAG: "{{(./)?}}main.swift": [
14+
// CHECK-RECORD-DAG: "{{(./)?}}other.swift": [
1515

1616

1717
// RUN: touch -t 201401240006 %t/other.swift

0 commit comments

Comments
 (0)