https://github.com/bd1976bris created https://github.com/llvm/llvm-project/pull/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. >From 64f8f35f34e8649f27a4401740265d839b0cad2f Mon Sep 17 00:00:00 2001 From: Dunbobbin <[email protected]> Date: Tue, 16 Sep 2025 17:46:39 +0100 Subject: [PATCH] [DTLTO][TEST] XFAIL Clang driver tests for Multicall toolchains 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. --- clang/test/Driver/DTLTO/dtlto.c | 5 ++++- clang/test/Driver/DTLTO/ps5-dtlto.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clang/test/Driver/DTLTO/dtlto.c b/clang/test/Driver/DTLTO/dtlto.c index 96795d9a4e6a4..053955a9e3d4a 100644 --- a/clang/test/Driver/DTLTO/dtlto.c +++ b/clang/test/Driver/DTLTO/dtlto.c @@ -1,5 +1,8 @@ // REQUIRES: lld +/// https://github.com/llvm/llvm-project/issues/159125. +// XFAIL: llvm-driver + /// Check DTLTO options are forwarded to the linker. /// Check that options are forwarded as expected with --thinlto-distributor=. @@ -10,7 +13,7 @@ // FORWARD: ld.lld // FORWARD-SAME: "--thinlto-distributor=d.exe" -// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]+}}" +// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}clang{{[^\"]*}}" // FORWARD-SAME: "--thinlto-distributor-arg=a1" // FORWARD-SAME: "--thinlto-distributor-arg=a2" // FORWARD-SAME: "--thinlto-distributor-arg=a3" diff --git a/clang/test/Driver/DTLTO/ps5-dtlto.c b/clang/test/Driver/DTLTO/ps5-dtlto.c index 9b70c88257a85..eb4691da9d2fc 100644 --- a/clang/test/Driver/DTLTO/ps5-dtlto.c +++ b/clang/test/Driver/DTLTO/ps5-dtlto.c @@ -1,5 +1,8 @@ // REQUIRES: lld +/// https://github.com/llvm/llvm-project/issues/159125. +// XFAIL: llvm-driver + /// Check DTLTO options are forwarded to the linker. /// Check that options are forwarded as expected with --thinlto-distributor=. @@ -10,7 +13,7 @@ // FORWARD: prospero-lld // FORWARD-SAME: "--thinlto-distributor=d.exe" -// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]+}}" +// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}clang{{[^\"]*}}" // FORWARD-SAME: "--thinlto-distributor-arg=a1" // FORWARD-SAME: "--thinlto-distributor-arg=a2" // FORWARD-SAME: "--thinlto-distributor-arg=a3" _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
