ignore whitespace in ldd tests

lcnr · lcnr · commit f0c38d5e41dc · 2024-05-24T15:59:21.000Z
diff --git a/tests/run-make/rust-lld-by-default/rmake.rs b/tests/run-make/rust-lld-by-default/rmake.rs
@@ -41,5 +41,5 @@ fn main() {
 fn find_lld_version_in_logs(output: &Output) -> bool {
     let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
     let stderr = std::str::from_utf8(&output.stderr).unwrap();
-    stderr.lines().any(|line| lld_version_re.is_match(line))
+    stderr.lines().any(|line| lld_version_re.is_match(line.trim_whitespace()))
 }
diff --git a/tests/run-make/rust-lld-custom-target/rmake.rs b/tests/run-make/rust-lld-custom-target/rmake.rs
@@ -47,5 +47,5 @@ fn main() {
 fn find_lld_version_in_logs(output: &Output) -> bool {
     let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
     let stderr = std::str::from_utf8(&output.stderr).unwrap();
-    stderr.lines().any(|line| lld_version_re.is_match(line))
+    stderr.lines().any(|line| lld_version_re.is_match(line.trim_whitespace()))
 }
diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs
@@ -61,5 +61,5 @@ fn main() {
 fn find_lld_version_in_logs(output: &Output) -> bool {
     let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
     let stderr = std::str::from_utf8(&output.stderr).unwrap();
-    stderr.lines().any(|line| lld_version_re.is_match(line))
+    stderr.lines().any(|line| lld_version_re.is_match(line.trim_whitespace()))
 }

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ fn main() {`
`41`	`41`	`fn find_lld_version_in_logs(output: &Output) -> bool {`
`42`	`42`	`let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();`
`43`	`43`	`let stderr = std::str::from_utf8(&output.stderr).unwrap();`
`44`		`- stderr.lines().any(\|line\| lld_version_re.is_match(line))`
	`44`	`+ stderr.lines().any(\|line\| lld_version_re.is_match(line.trim_whitespace()))`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ fn main() {`
`47`	`47`	`fn find_lld_version_in_logs(output: &Output) -> bool {`
`48`	`48`	`let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();`
`49`	`49`	`let stderr = std::str::from_utf8(&output.stderr).unwrap();`
`50`		`- stderr.lines().any(\|line\| lld_version_re.is_match(line))`
	`50`	`+ stderr.lines().any(\|line\| lld_version_re.is_match(line.trim_whitespace()))`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,5 @@ fn main() {`
`61`	`61`	`fn find_lld_version_in_logs(output: &Output) -> bool {`
`62`	`62`	`let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();`
`63`	`63`	`let stderr = std::str::from_utf8(&output.stderr).unwrap();`
`64`		`- stderr.lines().any(\|line\| lld_version_re.is_match(line))`
	`64`	`+ stderr.lines().any(\|line\| lld_version_re.is_match(line.trim_whitespace()))`
`65`	`65`	`}`