[DTLTO][TEST] Make Clang driver tests even more robust #159418
Merged
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
Remove XFAILs for Multicall. DTLTO is still incompatible with llvm-driver, but these tests now pass after llvm#159151. Modify a missed regex to use filename.py (missed in llvm#159151). Tighten overly greedy regexes to prevent spurious failures.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver Author: bd1976bris (bd1976bris) ChangesRemove XFAILs for Multicall. DTLTO is still incompatible with llvm-driver, but these tests now pass after #159151. Modify a missed regex to use filename.py (missed in #159151). Tighten overly greedy regexes to prevent spurious failures. Full diff: https://github.com/llvm/llvm-project/pull/159418.diff 2 Files Affected:
diff --git a/clang/test/Driver/DTLTO/dtlto.c b/clang/test/Driver/DTLTO/dtlto.c
index 66299c890e4b3..f31b635feed96 100644
--- a/clang/test/Driver/DTLTO/dtlto.c
+++ b/clang/test/Driver/DTLTO/dtlto.c
@@ -1,8 +1,5 @@
// 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=.
@@ -15,7 +12,7 @@
// FORWARD: filename.py:[[CLANG:.*]]
// FORWARD: ld.lld
// FORWARD-SAME: "--thinlto-distributor=d.exe"
-// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
// FORWARD-SAME: "--thinlto-distributor-arg=a3"
@@ -39,9 +36,10 @@
// RUN: FileCheck %s --input-file=%t_default.log --check-prefix=DEFAULT \
// RUN: --implicit-check-not=distributor --implicit-check-not=remote-compiler
+// DEFAULT: filename.py:[[CLANG:.*]]
// DEFAULT: ld.lld
// DEFAULT-SAME: "--thinlto-distributor=d.exe"
-// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]+}}"
+// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
/// Check that nothing is forwarded when the compiler is not in LTO mode, and that
/// appropriate unused option warnings are issued.
diff --git a/clang/test/Driver/DTLTO/ps5-dtlto.c b/clang/test/Driver/DTLTO/ps5-dtlto.c
index b52765db5b1c7..4c10a026f944b 100644
--- a/clang/test/Driver/DTLTO/ps5-dtlto.c
+++ b/clang/test/Driver/DTLTO/ps5-dtlto.c
@@ -1,8 +1,5 @@
// 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=.
@@ -15,7 +12,7 @@
// FORWARD: filename.py:[[CLANG:.*]]
// FORWARD: prospero-lld
// FORWARD-SAME: "--thinlto-distributor=d.exe"
-// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
// FORWARD-SAME: "--thinlto-distributor-arg=a3"
@@ -42,7 +39,7 @@
// DEFAULT: filename.py:[[CLANG:.*]]
// DEFAULT: prospero-lld
// DEFAULT-SAME: "--thinlto-distributor=d.exe"
-// DEFAULT-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
/// Check that the arguments are forwarded unconditionally even when the
/// compiler is not in LTO mode.
|
|
@llvm/pr-subscribers-clang Author: bd1976bris (bd1976bris) ChangesRemove XFAILs for Multicall. DTLTO is still incompatible with llvm-driver, but these tests now pass after #159151. Modify a missed regex to use filename.py (missed in #159151). Tighten overly greedy regexes to prevent spurious failures. Full diff: https://github.com/llvm/llvm-project/pull/159418.diff 2 Files Affected:
diff --git a/clang/test/Driver/DTLTO/dtlto.c b/clang/test/Driver/DTLTO/dtlto.c
index 66299c890e4b3..f31b635feed96 100644
--- a/clang/test/Driver/DTLTO/dtlto.c
+++ b/clang/test/Driver/DTLTO/dtlto.c
@@ -1,8 +1,5 @@
// 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=.
@@ -15,7 +12,7 @@
// FORWARD: filename.py:[[CLANG:.*]]
// FORWARD: ld.lld
// FORWARD-SAME: "--thinlto-distributor=d.exe"
-// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
// FORWARD-SAME: "--thinlto-distributor-arg=a3"
@@ -39,9 +36,10 @@
// RUN: FileCheck %s --input-file=%t_default.log --check-prefix=DEFAULT \
// RUN: --implicit-check-not=distributor --implicit-check-not=remote-compiler
+// DEFAULT: filename.py:[[CLANG:.*]]
// DEFAULT: ld.lld
// DEFAULT-SAME: "--thinlto-distributor=d.exe"
-// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]+}}"
+// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
/// Check that nothing is forwarded when the compiler is not in LTO mode, and that
/// appropriate unused option warnings are issued.
diff --git a/clang/test/Driver/DTLTO/ps5-dtlto.c b/clang/test/Driver/DTLTO/ps5-dtlto.c
index b52765db5b1c7..4c10a026f944b 100644
--- a/clang/test/Driver/DTLTO/ps5-dtlto.c
+++ b/clang/test/Driver/DTLTO/ps5-dtlto.c
@@ -1,8 +1,5 @@
// 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=.
@@ -15,7 +12,7 @@
// FORWARD: filename.py:[[CLANG:.*]]
// FORWARD: prospero-lld
// FORWARD-SAME: "--thinlto-distributor=d.exe"
-// FORWARD-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// FORWARD-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
// FORWARD-SAME: "--thinlto-distributor-arg=a1"
// FORWARD-SAME: "--thinlto-distributor-arg=a2"
// FORWARD-SAME: "--thinlto-distributor-arg=a3"
@@ -42,7 +39,7 @@
// DEFAULT: filename.py:[[CLANG:.*]]
// DEFAULT: prospero-lld
// DEFAULT-SAME: "--thinlto-distributor=d.exe"
-// DEFAULT-SAME: "--thinlto-remote-compiler={{.*}}[[CLANG]]"
+// DEFAULT-SAME: "--thinlto-remote-compiler={{[^"]*}}[[CLANG]]"
/// Check that the arguments are forwarded unconditionally even when the
/// compiler is not in LTO mode.
|
petrhosek
approved these changes
Sep 17, 2025
|
Thanks @petrhosek :) |
|
Test comment to test what happens when I update my GitHub |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Remove XFAILs for llvm-driver. DTLTO is still incompatible with llvm-driver, but these tests now pass after #159151.
Modify a missed regex to use filename.py (missed in #159151).
Tighten overly greedy regexes to prevent spurious failures.