Commit e04daf9

authored

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 #139823 -- the test fails for me because my build dir is a symlink.

2 parents c5e81ea + 25036f5 commit e04daf9Copy full SHA for e04daf9

File tree

1 file changed

-1

lines changed

tests/run-make/linker-warning
- rmake.rs

1 file changed

-1

lines changed

`‎tests/run-make/linker-warning/rmake.rs‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ fn main() {`
`64`	`64`	`.normalize(r#"/rustc[^/_-]*/"#, "/rustc/")`
`65`	`65`	`.normalize("libpanic_abort", "libpanic_unwind")`
`66`	`66`	`.normalize(`
`67`		`- regex::escape(run_make_support::build_root().to_str().unwrap()),`
	`67`	`+ regex::escape(`
	`68`	`+ run_make_support::build_root().canonicalize().unwrap().to_str().unwrap(),`
	`69`	`+ ),`
`68`	`70`	`"/build-root",`
`69`	`71`	`)`
`70`	`72`	`.normalize(r#""[^"]*\/symbols.o""#, "\"/symbols.o\"")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e04daf9

File tree

1 file changed

1 file changed

`‎tests/run-make/linker-warning/rmake.rs‎`

0 commit comments