Allow LLD version info to be either stderr or stdout

jyn514 · jyn514 · commit 8b92619ce6b1 · 2025-01-24T10:30:47.000-05:00
diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs
@@ -55,6 +55,6 @@ fn main() {
 
 fn find_lld_version_in_logs(stderr: String) -> bool {
     let lld_version_re =
-        Regex::new(r"^warning: linker stdout: LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
+        Regex::new(r"^warning: linker std(out|err): LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
     stderr.lines().any(|line| lld_version_re.is_match(line.trim()))
 }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ fn main() {`
`55`	`55`
`56`	`56`	`fn find_lld_version_in_logs(stderr: String) -> bool {`
`57`	`57`	`let lld_version_re =`
`58`		`- Regex::new(r"^warning: linker stdout: LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();`
	`58`	`+ Regex::new(r"^warning: linker std(out\|err): LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();`
`59`	`59`	`stderr.lines().any(\|line\| lld_version_re.is_match(line.trim()))`
`60`	`60`	`}`