Skip to content

Commit 8742e05

Browse files
committed
Auto merge of rust-lang#134845 - jieyouxu:temp-drop-warning, r=onur-ozkan
bootstrap: drop warning for top-level test suite path check due to false positives The current top-level test suite directory does not exist warning logic doesn't quite handle the more exotic path suffix matches that test filters seem to accept (e.g. `library/test` can be matched with `--exclude test`), so avoid warning on non-existent top-level test suites for now. To avoid false positives, we probably need to query test `Step`s for their `should_run(exclude_filter)` logic. This retains the fix for the Windows path handling (unlike rust-lang#134843). r? `@onur-ozkan`
2 parents ceb0441 + c393811 commit 8742e05

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

Diff for: src/bootstrap/src/core/config/config.rs

+4-13
Original file line numberDiff line numberDiff line change
@@ -1325,23 +1325,14 @@ impl Config {
13251325
.into_iter()
13261326
.chain(flags.exclude)
13271327
.map(|p| {
1328-
let p = if cfg!(windows) {
1328+
// Never return top-level path here as it would break `--skip`
1329+
// logic on rustc's internal test framework which is utilized
1330+
// by compiletest.
1331+
if cfg!(windows) {
13291332
PathBuf::from(p.to_str().unwrap().replace('/', "\\"))
13301333
} else {
13311334
p
1332-
};
1333-
1334-
// Jump to top-level project path to support passing paths
1335-
// from sub directories.
1336-
let top_level_path = config.src.join(&p);
1337-
if !config.src.join(&top_level_path).exists() {
1338-
eprintln!("WARNING: '{}' does not exist.", top_level_path.display());
13391335
}
1340-
1341-
// Never return top-level path here as it would break `--skip`
1342-
// logic on rustc's internal test framework which is utilized
1343-
// by compiletest.
1344-
p
13451336
})
13461337
.collect();
13471338

0 commit comments

Comments
 (0)