Skip to content

Commit

Permalink
Unrolled build for rust-lang#134209
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#134209 - onur-ozkan:check-skip-paths, r=jieyouxu

validate `--skip` and `--exclude` paths

Fixes rust-lang#134198

cc ``@ChrisDenton``
  • Loading branch information
rust-timer authored Dec 14, 2024
2 parents 4a204be + 65a609b commit 92d4650
Showing 1 changed file with 25 additions and 1 deletion.
26 changes: 25 additions & 1 deletion src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 92d4650

Please sign in to comment.