diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-07-26 22:42:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-26 22:42:38 -0400 |
| commit | e04daf98f145bd8b6d64ef11884503d600043ca6 (patch) | |
| tree | b415633e7b630d62b1f331821250f6a932ac863d | |
| parent | c5e81ea8d2f2f695cf7e42888a7290540561daec (diff) | |
| parent | 25036f52a00586774cc84cd9415b88325fcc5930 (diff) | |
| download | rust-e04daf98f145bd8b6d64ef11884503d600043ca6.tar.gz rust-e04daf98f145bd8b6d64ef11884503d600043ca6.zip | |
Rollup merge of #144453 - WaffleLapkin:canonical-build-root, r=jieyouxu
canonicalize build root in `tests/run-make/linker-warning` r? jieyouxu This is similar to rust-lang/rust#139823 -- the test fails for me because my build dir is a symlink.
| -rw-r--r-- | tests/run-make/linker-warning/rmake.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs index 57b68c65930..9ea706af503 100644 --- a/tests/run-make/linker-warning/rmake.rs +++ b/tests/run-make/linker-warning/rmake.rs @@ -64,7 +64,9 @@ fn main() { .normalize(r#"/rustc[^/_-]*/"#, "/rustc/") .normalize("libpanic_abort", "libpanic_unwind") .normalize( - regex::escape(run_make_support::build_root().to_str().unwrap()), + regex::escape( + run_make_support::build_root().canonicalize().unwrap().to_str().unwrap(), + ), "/build-root", ) .normalize(r#""[^"]*\/symbols.o""#, "\"/symbols.o\"") |