Skip to content

Commit 7bc91f3

Browse files
authored
[DTLTO][TEST] XFAIL Clang driver tests for Multicall toolchains (#159129)
Previously I masked issues with Multicall + DTLTO (see #148908) due to an incomplete understanding of how the Multicall toolchain works. This patch reverts those incorrect changes and instead marks the affected tests XFAIL when running under Multicall. Issue #159125 tracks fixing DTLTO with Multicall.
1 parent 55e6b32 commit 7bc91f3

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

clang/test/Driver/DTLTO/dtlto.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// REQUIRES: lld
22

3+
/// https://github.com/llvm/llvm-project/issues/159125.
4+
// XFAIL: llvm-driver
5+
36
/// Check DTLTO options are forwarded to the linker.
47

58
/// Check that options are forwarded as expected with --thinlto-distributor=.
@@ -10,7 +13,7 @@
1013

1114
// FORWARD: ld.lld
1215
// FORWARD-SAME: "--thinlto-distributor=d.exe"
13-
// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]+}}"
16+
// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}clang{{[^\"]*}}"
1417
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
1518
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
1619
// FORWARD-SAME: "--thinlto-distributor-arg=a3"

clang/test/Driver/DTLTO/ps5-dtlto.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// REQUIRES: lld
22

3+
/// https://github.com/llvm/llvm-project/issues/159125.
4+
// XFAIL: llvm-driver
5+
36
/// Check DTLTO options are forwarded to the linker.
47

58
/// Check that options are forwarded as expected with --thinlto-distributor=.
@@ -10,7 +13,7 @@
1013

1114
// FORWARD: prospero-lld
1215
// FORWARD-SAME: "--thinlto-distributor=d.exe"
13-
// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]+}}"
16+
// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}clang{{[^\"]*}}"
1417
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
1518
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
1619
// FORWARD-SAME: "--thinlto-distributor-arg=a3"

0 commit comments

Comments
 (0)