Skip to content

Commit 5661bff

Browse files
authored
Merge pull request #29533 from davidungar/putative-fix-for-rdar-58959395-type-fingerprint-test
2 parents 454b30d + 0440e91 commit 5661bff

File tree

1 file changed

+25
-4
lines changed

1 file changed

+25
-4
lines changed

test/Frontend/type-fingerprint.swift

+25-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,27 @@
1212
// RUN: cp %S/Inputs/type-fingerprint/{main,a}.swift %t
1313
// RUN: cp %S/Inputs/type-fingerprint/ofm.json %t
1414
// RUN: cp %S/Inputs/type-fingerprint/b0.swift %t/b.swift
15+
16+
// Seeing weird failure on CI, so set the mod times
17+
// RUN: touch -t 200101010101 %t/*.swift
18+
1519
// RUN: cd %t && %swiftc_driver -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental ./main.swift ./a.swift ./b.swift -module-name main -output-file-map ofm.json >&output1
1620

17-
// RUN: cp %t/b.swiftdeps %t/b1.swiftdeps
21+
// only-run-for-debugging: cp %t/b.swiftdeps %t/b1.swiftdeps
1822

1923
// Change one type, but uses of all types get recompiled
2024

2125
// RUN: cp %S/Inputs/type-fingerprint/b1.swift %t/b.swift
26+
27+
// Seeing weird failure on CI, so ensure that b.swift is newer
28+
// RUN: touch -t 200201010101 %t/*
29+
// RUN: touch -t 200101010101 %t/*.swift
30+
// RUN: touch -t 200301010101 %t/b.swift
31+
2232
// RUN: cd %t && %swiftc_driver -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental ./main.swift ./a.swift ./b.swift -module-name main -output-file-map ofm.json >&output2
2333

24-
// RUN: cp %t/b.swiftdeps %t/b2.swiftdeps
34+
// Save for debugging:
35+
// only-run-for-debugging: cp %t/b.swiftdeps %t/b2.swiftdeps
2536

2637
// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output2
2738

@@ -40,16 +51,26 @@
4051
// RUN: cp %S/Inputs/type-fingerprint/{main,a}.swift %t
4152
// RUN: cp %S/Inputs/type-fingerprint/ofm.json %t
4253
// RUN: cp %S/Inputs/type-fingerprint/b0.swift %t/b.swift
54+
55+
// Seeing weird failure on CI, so set the mod times
56+
// RUN: touch -t 200101010101 %t/*.swift
57+
4358
// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental ./main.swift ./a.swift ./b.swift -module-name main -output-file-map ofm.json >&output3
4459

45-
// RUN: cp %t/b.swiftdeps %t/b3.swiftdeps
60+
// only-run-for-debugging: cp %t/b.swiftdeps %t/b3.swiftdeps
4661

4762
// Change one type, only uses of that type get recompiled
4863

4964
// RUN: cp %S/Inputs/type-fingerprint/b1.swift %t/b.swift
65+
66+
// Seeing weird failure on CI, so ensure that b.swift is newer
67+
// RUN: touch -t 200201010101 %t/*
68+
// RUN: touch -t 200101010101 %t/*.swift
69+
// RUN: touch -t 200301010101 %t/b.swift
70+
5071
// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental ./main.swift ./a.swift ./b.swift -module-name main -output-file-map ofm.json >&output4
5172

52-
// RUN: cp %t/b.swiftdeps %t/b4.swiftdeps
73+
// only-run-for-debugging: cp %t/b.swiftdeps %t/b4.swiftdeps
5374

5475
// RUN: %FileCheck -check-prefix=CHECK-MAINB-RECOMPILED %s < %t/output4
5576

0 commit comments

Comments
 (0)