about summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorPietro Albini <pietro.albini@ferrous-systems.com>2022-11-16 10:07:42 +0100
committerPietro Albini <pietro.albini@ferrous-systems.com>2022-11-16 10:07:42 +0100
commit470423c3d2cde3a62d5d4ac23840d734e8145366 (patch)
tree3917b133e8a19ecad3b6a82c5048d629b30be308 /src/tools/compiletest
parent80d535966c93136fff0de7f30539b19c5f7e2d3d (diff)
downloadrust-470423c3d2cde3a62d5d4ac23840d734e8145366.tar.gz
rust-470423c3d2cde3a62d5d4ac23840d734e8145366.zip
normalize download-rustc's prefix when running compiletests
Diffstat (limited to 'src/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/runtest.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index d085023a27e..74700c602dd 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3536,6 +3536,8 @@ impl<'test> TestCx<'test> {
             Some(self.config.sysroot_base.join("lib").join("rustlib").join("src").join("rust")),
             // Virtual `/rustc/$sha` remapped paths (if `remap-debuginfo` is enabled):
             option_env!("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR").map(PathBuf::from),
+            // Virtual `/rustc/$sha` coming from download-rustc:
+            std::env::var_os("FAKE_DOWNLOAD_RUSTC_PREFIX").map(PathBuf::from),
         ];
         for base_dir in source_bases {
             if let Some(base_dir) = base_dir {