about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRémy Rakic <remy.rakic@gmail.com>2025-03-05 10:54:11 +0100
committerRémy Rakic <remy.rakic@gmail.com>2025-03-05 11:54:53 +0100
commit36efaf8437fd3926868293c87fa6cffc6f309bb2 (patch)
tree7f79043cea8be5ae40de3ba15709ab8bf881cf65
parentac951d379913c667a1fb73a0830e81d65d2007cf (diff)
downloadrust-36efaf8437fd3926868293c87fa6cffc6f309bb2.tar.gz
rust-36efaf8437fd3926868293c87fa6cffc6f309bb2.zip
normalize away `-Wlinker-messages` wrappers from `rust-lld` rmake test
-rw-r--r--tests/run-make/rust-lld/rmake.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs
index e5ae9435388..35f716c24c7 100644
--- a/tests/run-make/rust-lld/rmake.rs
+++ b/tests/run-make/rust-lld/rmake.rs
@@ -60,7 +60,8 @@ fn main() {
 }
 
 fn find_lld_version_in_logs(stderr: String) -> bool {
-    let lld_version_re =
-        Regex::new(r"^warning: linker std(out|err): LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
+    // Strip the `-Wlinker-messages` wrappers prefixing the linker output.
+    let stderr = Regex::new(r"warning: linker std(out|err):").unwrap().replace_all(&stderr, "");
+    let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
     stderr.lines().any(|line| lld_version_re.is_match(line.trim()))
 }