user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-link-with-link-args by introducing another normalization.

Browse source
This commit is contained in:
David Wood 2018-08-09 17:17:20 +02:00
parent 003b5a8b0f
commit 7c13eb42d4
No known key found for this signature in database
GPG key ID: 01760B4F9F53F154
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/compiletest/src/runtest.rs
View file

@ -2927,6 +2927,11 @@ impl<'test> TestCx<'test> {
// eg. /home/user/rust/build
normalized = normalized.replace(&parent_build_dir.to_str().unwrap(), "$BUILD_DIR");
// Paths into lib directory.
let mut lib_dir = parent_build_dir.parent().unwrap().to_path_buf();
lib_dir.push("lib");
normalized = normalized.replace(&lib_dir.to_str().unwrap(), "$LIB_DIR");
if json {
// escaped newlines in json strings should be readable
// in the stderr files. There's no point int being correct,