diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-26 20:49:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 20:49:14 +0200 |
| commit | a1956e281af84ecc42b1f5bfdfe312f9e70cf850 (patch) | |
| tree | 20204290825608e2dbebd00566fe4b9b5e2a25d0 | |
| parent | 43a38e7e55b94f43610b2f9ca02f3438bd4f6a02 (diff) | |
| parent | 7d773c3304731716cc54db3531ba54067ca55a4a (diff) | |
| download | rust-a1956e281af84ecc42b1f5bfdfe312f9e70cf850.tar.gz rust-a1956e281af84ecc42b1f5bfdfe312f9e70cf850.zip | |
Rollup merge of #114090 - mdibaiee:remove-remap-path-prefix-ci, r=wesleywiser
compiletest: remove ci-specific remap-path-prefix Now that we have fixed the underlying cause of long type name inconsistencies in #113893, we can remove the remap-path-prefix logic from CI resolves #113424
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 4ae2249097f..269d9384376 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -6,7 +6,6 @@ use std::io::BufReader; use std::path::{Path, PathBuf}; use std::process::Command; -use build_helper::ci::CiEnv; use tracing::*; use crate::common::{Config, Debugger, FailMode, Mode, PassMode}; @@ -298,13 +297,6 @@ impl TestProps { /// `//[foo]`), then the property is ignored unless `cfg` is /// `Some("foo")`. fn load_from(&mut self, testfile: &Path, cfg: Option<&str>, config: &Config) { - // In CI, we've sometimes encountered non-determinism related to truncating very long paths. - // Set a consistent (short) prefix to avoid issues, but only in CI to avoid regressing the - // contributor experience. - if CiEnv::is_ci() { - self.remap_src_base = config.mode == Mode::Ui && !config.suite.contains("rustdoc"); - } - let mut has_edition = false; if !testfile.is_dir() { let file = File::open(testfile).unwrap(); |
