diff options
| author | Michael Goulet <michael@errs.io> | 2023-09-20 19:00:34 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-09-21 04:11:53 +0000 |
| commit | bb6a46592f173bd1ee045f8d57ed66d9dbe5812d (patch) | |
| tree | e0ad8dfd83500e3038dc22a9ae44c5c337753980 /src | |
| parent | cbce15c6173cd0fcd4abe25c108067d32f1135b4 (diff) | |
| download | rust-bb6a46592f173bd1ee045f8d57ed66d9dbe5812d.tar.gz rust-bb6a46592f173bd1ee045f8d57ed66d9dbe5812d.zip | |
Fix ui-fulldeps --stage=1 with -Zignore-directory-in-diagnostics-source-blocks
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 7b42d8e9b58..657d074b380 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2335,14 +2335,17 @@ impl<'test> TestCx<'test> { rustc.arg("-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX"); rustc.arg("-Ztranslate-remapped-path-to-local-path=no"); - // Hide Cargo dependency sources from ui tests to make sure the error message doesn't - // change depending on whether $CARGO_HOME is remapped or not. If this is not present, - // when $CARGO_HOME is remapped the source won't be shown, and when it's not remapped the - // source will be shown, causing a blessing hell. - rustc.arg("-Z").arg(format!( - "ignore-directory-in-diagnostics-source-blocks={}", - home::cargo_home().expect("failed to find cargo home").to_str().unwrap() - )); + // #[cfg(not(bootstrap))]: After beta bump, this should **always** run. + if !(self.config.stage_id.starts_with("stage1-") && self.config.suite == "ui-fulldeps") { + // Hide Cargo dependency sources from ui tests to make sure the error message doesn't + // change depending on whether $CARGO_HOME is remapped or not. If this is not present, + // when $CARGO_HOME is remapped the source won't be shown, and when it's not remapped the + // source will be shown, causing a blessing hell. + rustc.arg("-Z").arg(format!( + "ignore-directory-in-diagnostics-source-blocks={}", + home::cargo_home().expect("failed to find cargo home").to_str().unwrap() + )); + } // Optionally prevent default --sysroot if specified in test compile-flags. if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot")) |