diff options
| author | bors <bors@rust-lang.org> | 2024-12-28 19:20:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-28 19:20:22 +0000 |
| commit | 8742e0556dee3c64f7144de2fb2e88936418865a (patch) | |
| tree | e1d5d754092d24c1ff2b2248135a9f3632dc0705 | |
| parent | ceb0441e82259c6fca91aa5aea391e9d0f3ec272 (diff) | |
| parent | c393811a48932a13b44ef2546a6c0f7ce9225857 (diff) | |
| download | rust-8742e0556dee3c64f7144de2fb2e88936418865a.tar.gz rust-8742e0556dee3c64f7144de2fb2e88936418865a.zip | |
Auto merge of #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 #134843). r? `@onur-ozkan`
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index d54a93179d9..87f7041268c 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -1325,23 +1325,14 @@ impl Config { .into_iter() .chain(flags.exclude) .map(|p| { - let p = if cfg!(windows) { + // Never return top-level path here as it would break `--skip` + // logic on rustc's internal test framework which is utilized + // by compiletest. + if cfg!(windows) { PathBuf::from(p.to_str().unwrap().replace('/', "\\")) } else { p - }; - - // Jump to top-level project path to support passing paths - // from sub directories. - let top_level_path = config.src.join(&p); - if !config.src.join(&top_level_path).exists() { - eprintln!("WARNING: '{}' does not exist.", top_level_path.display()); } - - // Never return top-level path here as it would break `--skip` - // logic on rustc's internal test framework which is utilized - // by compiletest. - p }) .collect(); |
