Skip to content

[DNM] Add some debugging for failing test #64098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[DNM] Add some debugging for failing test #64098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adfcb49
Revert "Disable Incremental/Fingerprints tests"
bnbarham Mar 5, 2023
b5a5fbc
[DNM] Change back to target-swiftc-driver
bnbarham Mar 5, 2023
c1693da
add more debugging
bnbarham Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions test/Incremental/Fingerprints/class-fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
// Seeing weird failure on CI, so set the mod times
// RUN: touch -t 200101010101 %t/*.swift

// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json
// RUN: cd %t && %swiftc_driver-stdlib-target -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json

// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps

Expand All @@ -30,7 +31,5 @@

// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4

// REQUIRES: rdar106170343

// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
1 change: 0 additions & 1 deletion test/Incremental/Fingerprints/enum-fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@

// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4

// REQUIRES: rdar106170343
// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
2 changes: 0 additions & 2 deletions test/Incremental/Fingerprints/extension-adds-member.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED-W %s < %t/output4
// RUN: %FileCheck -check-prefix=CHECK-NOT-RECOMPILED-W %s < %t/output4

// REQUIRES: rdar106170343

// CHECK-RECOMPILED-W: {compile: definesAB.o <= definesAB.swift}
// CHECK-RECOMPILED-W: {compile: usesA.o <= usesA.swift}

Expand Down
2 changes: 0 additions & 2 deletions test/Incremental/Fingerprints/nested-enum-fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,5 @@

// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4

// REQUIRES: rdar106170343

// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
2 changes: 0 additions & 2 deletions test/Incremental/Fingerprints/protocol-fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,5 @@

// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4

// REQUIRES: rdar106170343

// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
2 changes: 0 additions & 2 deletions test/Incremental/Fingerprints/struct-fingerprint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,5 @@

// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4

// REQUIRES: rdar106170343

// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
2 changes: 0 additions & 2 deletions test/Incremental/cross-file-failure.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@

// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED %s --dump-input=always < %t/output-incremental

// REQUIRES: rdar106170343

// CHECK-RECOMPILED: Queuing (initial): {compile: definesA.o <= definesA.swift}
// CHECK-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
2 changes: 0 additions & 2 deletions test/Incremental/superfluous-cascade.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@

// RUN: %FileCheck -check-prefix=CHECK-RECOMPILED %s --dump-input=always < %t/output4

// REQUIRES: rdar106170343

// CHECK-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesPoint.o <= usesPoint.swift}
// CHECK-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesDisplay.o <= usesDisplay.swift}
12 changes: 12 additions & 0 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,9 @@ if run_vendor == 'apple':
"-Xlinker -headerpad_max_install_names " +
"-Xlinker -rpath -Xlinker /usr/lib/swift %s ")%
(xcrun_prefix, config.swiftc, target_options, config.swift_driver_test_options))
print(f"Set target_swiftc_driver in apple block to '{config.target_swiftc_driver}'")
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
print(f"Set swiftc_driver_stdlib_target in apple block to '{config.swiftc_driver_stdlib_target}'")
config.target_clang = (
"%s %s %s" %
(xcrun_prefix, config.clangxx, config.target_cc_options))
Expand Down Expand Up @@ -1468,10 +1470,12 @@ elif run_os in ['windows-msvc']:
config.resource_dir_opt, mcp_opt, \
config.swift_system_overlay_opt, \
config.swift_driver_test_options))
print(f"Set target_swiftc_driver in windows block to '{config.target_swiftc_driver}'")
config.swiftc_driver_stdlib_target = \
('%r -target %s %s %s %s' % (config.swiftc, config.variant_triple, \
config.resource_dir_opt, mcp_opt, \
config.swift_driver_test_options))
print(f"Set swiftc_driver_stdlib_target in windows block to '{config.swiftc_driver_stdlib_target}'")
config.target_swift_modulewrap = \
('%r -modulewrap -target %s' % (config.swiftc, config.variant_triple))
config.target_swift_emit_pcm = \
Expand Down Expand Up @@ -1599,7 +1603,9 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
config.target_swiftc_driver = (
"%s -target %s -toolchain-stdlib-rpath %s %s %s" %
(config.swiftc, config.variant_triple, config.resource_dir_opt, mcp_opt, config.swift_driver_test_options))
print(f"Set target_swiftc_driver in linux block to '{config.target_swiftc_driver}'")
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
print(f"Set swiftc_driver_stdlib_target in linux block to '{config.swiftc_driver_stdlib_target}'")
config.target_swift_modulewrap = (
'%s -modulewrap -target %s' %
(config.swiftc, config.variant_triple))
Expand Down Expand Up @@ -1718,7 +1724,9 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
'-tools-directory', tools_directory,
config.resource_dir_opt, mcp_opt,
config.swift_driver_test_options])
print(f"Set target_swiftc_driver in android block to '{config.target_swiftc_driver}'")
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
print(f"Set swiftc_driver_stdlib_target in android block to '{config.swiftc_driver_stdlib_target}'")
config.target_swift_modulewrap = ' '.join([
config.swiftc, '-modulewrap',
'-target', config.variant_triple])
Expand Down Expand Up @@ -1786,7 +1794,9 @@ elif run_os == 'wasi':
config.target_swiftc_driver = (
"%s -target %s -toolchain-stdlib-rpath %s %s" %
(config.swiftc, config.variant_triple, config.resource_dir_opt, mcp_opt))
print(f"Set target_swiftc_driver in wasi block to '{config.target_swiftc_driver}'")
config.swiftc_driver_stdlib_target = config.target_swiftc_driver
print(f"Set swiftc_driver_stdlib_target in wasi block to '{config.swiftc_driver_stdlib_target}'")
config.target_swift_modulewrap = (
'%s -modulewrap -target %s' %
(config.swiftc, config.variant_triple))
Expand Down Expand Up @@ -2504,7 +2514,9 @@ config.substitutions.append(('%target-swift-reflection-test', config.target_swif

config.substitutions.append(('%target-swift-reflection-dump', '{} {} {}'.format(config.swift_reflection_dump, '-arch', run_cpu)))
config.substitutions.append(('%target-swiftc_driver', config.target_swiftc_driver))
print(f"Substituting target-swiftc_driver for '{config.target_swiftc_driver}'")
config.substitutions.append(('%swiftc_driver-stdlib-target', config.swiftc_driver_stdlib_target))
print(f"Substituting swiftc_driver-stdlib-target for '{config.swiftc_driver_stdlib_target}'")

config.substitutions.append(('%target-swift-remoteast-test-with-sdk',
'%s %s -sdk %r' %
Expand Down