bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix ui-fulldeps --stage=1 with -Zignore-directory-in-diagnostics-source-blocks

Browse source
This commit is contained in:
Michael Goulet 2023-09-20 19:00:34 +00:00
parent cbce15c617
commit bb6a46592f
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2335,14 +2335,17 @@ impl<'test> TestCx<'test> {
rustc.arg("-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX"); rustc.arg("-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX");
rustc.arg("-Ztranslate-remapped-path-to-local-path=no"); rustc.arg("-Ztranslate-remapped-path-to-local-path=no");
// Hide Cargo dependency sources from ui tests to make sure the error message doesn't // #[cfg(not(bootstrap))]: After beta bump, this should **always** run.
// change depending on whether $CARGO_HOME is remapped or not. If this is not present, if !(self.config.stage_id.starts_with("stage1-") && self.config.suite == "ui-fulldeps") {
// when $CARGO_HOME is remapped the source won't be shown, and when it's not remapped the // Hide Cargo dependency sources from ui tests to make sure the error message doesn't
// source will be shown, causing a blessing hell. // change depending on whether $CARGO_HOME is remapped or not. If this is not present,
rustc.arg("-Z").arg(format!( // when $CARGO_HOME is remapped the source won't be shown, and when it's not remapped the
"ignore-directory-in-diagnostics-source-blocks={}", // source will be shown, causing a blessing hell.
home::cargo_home().expect("failed to find cargo home").to_str().unwrap() 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. // Optionally prevent default --sysroot if specified in test compile-flags.
if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot")) if !self.props.compile_flags.iter().any(|flag| flag.starts_with("--sysroot"))