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

Normalise remapped sysroot path as $SRC_DIR

Browse source
This commit is contained in:
Andy Wang 2021-05-03 17:12:10 +01:00
parent 65520ec802
commit d66506d353
No known key found for this signature in database
GPG key ID: 181B49F9F38F3374
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3616,6 +3616,12 @@ impl<'test> TestCx<'test> {
.join("library");
normalize_path(&src_dir, "$SRC_DIR");
if let Some(virtual_rust_source_base_dir) =
option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from)
{
normalize_path(&virtual_rust_source_base_dir.join("library"), "$SRC_DIR");
}
// Paths into the build directory
let test_build_dir = &self.config.build_base;
let parent_build_dir = test_build_dir.parent().unwrap().parent().unwrap().parent().unwrap();