Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit d66506d

Browse files
committed
Normalise remapped sysroot path as $SRC_DIR
1 parent 65520ec commit d66506d

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3616,6 +3616,12 @@ impl<'test> TestCx<'test> {
36163616
.join("library");
36173617
normalize_path(&src_dir, "$SRC_DIR");
36183618

3619+
if let Some(virtual_rust_source_base_dir) =
3620+
option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from)
3621+
{
3622+
normalize_path(&virtual_rust_source_base_dir.join("library"), "$SRC_DIR");
3623+
}
3624+
36193625
// Paths into the build directory
36203626
let test_build_dir = &self.config.build_base;
36213627
let parent_build_dir = test_build_dir.parent().unwrap().parent().unwrap().parent().unwrap();

0 commit comments

Comments
 (0)