[DTLTO][TEST] XFAIL Clang driver tests for Multicall toolchains #159129
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously I masked issues with Multicall + DTLTO (see llvm#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 llvm#159125 tracks fixing DTLTO with Multicall.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: bd1976bris (bd1976bris) ChangesPreviously 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. Full diff: https://github.com/llvm/llvm-project/pull/159129.diff 2 Files Affected:
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"
|
ilovepi
approved these changes
Sep 16, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/10/builds/13600 Here is the relevant piece of the build log for the reference |
|
Hi, it appears this breaks one of our bots. Can this be reverted or forward-fixed? |
|
I will try to put up a forward fix in the next 10 mins or so. |
bd1976bris
added a commit
to bd1976bris/llvm-project
that referenced
this pull request
Sep 16, 2025
The Clang driver tests tried to match the Clang executable name via a regular expression. This failed on some buildbots where the name was not anticipated. Make the test more robust by extracting the filename with Python and appending a line to the output. This is then captured into a FileCheck variable and used directly in the check for the executable name. Should fix buildbot failures caused by the merge of PR llvm#159129.
This was referenced Sep 16, 2025
bd1976bris
added a commit
that referenced
this pull request
Sep 16, 2025
) Make the test regexes more permissive to fix buildbot failures caused by the merge of PR #159129. This mirrors the earlier fix in PR #148908. We retain cross-project-test coverage to verify that the path content is correct. A follow-up will update the tests to robustly check the Clang executable filename, likely along the lines of PR #159151. Short-term unbreak to keep the buildbots green without reverting a chain of commits.
|
This change also appears to have broken our Windows builders: |
bd1976bris
added a commit
that referenced
this pull request
Sep 17, 2025
The Clang driver tests tried to match the Clang executable name via a regular expression. This failed on some buildbots where the name was not anticipated. Make the test more robust by extracting the filename with Python and appending a line to the output. This is then captured into a FileCheck variable and used directly in the check for the executable name. Should fix buildbot failures caused by the merge of PR #159129.
Yes. Thanks. I'll do that now. The underlying issue that DLTTO doesn't work with Multicall is still present but I think that the test will pass now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.