bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #134209 - onur-ozkan:check-skip-paths, r=jieyouxu

Browse source 
validate `--skip` and `--exclude` paths

Fixes #134198

cc ``@ChrisDenton``
This commit is contained in:
Matthias Krüger 2024-12-14 03:54:32 +01:00 • committed by GitHub
commit 6cf13b0036
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/bootstrap/src/core/config/config.rs
View file

@ -1320,7 +1320,31 @@ impl Config {
// Set flags.
config.paths = std::mem::take(&mut flags.paths);
config.skip = flags.skip.into_iter().chain(flags.exclude).collect();
config.skip = flags
.skip
.into_iter()
.chain(flags.exclude)
.map(|p| {
let p = 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();
config.include_default_paths = flags.include_default_paths;
config.rustc_error_format = flags.rustc_error_format;
config.json_output = flags.json_output;