Skip to content

Commit a1956e2

Browse files
authored
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
2 parents 43a38e7 + 7d773c3 commit a1956e2

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/tools/compiletest/src/header.rs

-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::io::BufReader;
66
use std::path::{Path, PathBuf};
77
use std::process::Command;
88

9-
use build_helper::ci::CiEnv;
109
use tracing::*;
1110

1211
use crate::common::{Config, Debugger, FailMode, Mode, PassMode};
@@ -298,13 +297,6 @@ impl TestProps {
298297
/// `//[foo]`), then the property is ignored unless `cfg` is
299298
/// `Some("foo")`.
300299
fn load_from(&mut self, testfile: &Path, cfg: Option<&str>, config: &Config) {
301-
// In CI, we've sometimes encountered non-determinism related to truncating very long paths.
302-
// Set a consistent (short) prefix to avoid issues, but only in CI to avoid regressing the
303-
// contributor experience.
304-
if CiEnv::is_ci() {
305-
self.remap_src_base = config.mode == Mode::Ui && !config.suite.contains("rustdoc");
306-
}
307-
308300
let mut has_edition = false;
309301
if !testfile.is_dir() {
310302
let file = File::open(testfile).unwrap();

0 commit comments

Comments
 (0)