diff options
| author | 许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com> | 2024-12-28 17:54:59 +0800 |
|---|---|---|
| committer | 许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com> | 2024-12-28 17:55:05 +0800 |
| commit | c393811a48932a13b44ef2546a6c0f7ce9225857 (patch) | |
| tree | 47c20469c52be04fba6df6c48610cda96c2f0a31 | |
| parent | 7cb084932ec9d787230ef1bccadfdff395c628f1 (diff) | |
| download | rust-c393811a48932a13b44ef2546a6c0f7ce9225857.tar.gz rust-c393811a48932a13b44ef2546a6c0f7ce9225857.zip | |
bootstrap: drop warning for top-level test suite path check
This 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. A proper fix will need to possibly query test `Step`s for their exclude logic.
| -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 435216ef534..a3bf1021f9a 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(); |
