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.
This commit is contained in:
commit
e04daf98f1
1 changed files with 3 additions and 1 deletions
|
|
@ -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\"")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue