bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #93399 - ehuss:fix-compiletest-path-relative, r=Mark-Simulacrum

Browse source 
rustbuild: Fix compiletest warning when building outside of root.

This fixes a warning that would happen when passing arguments to compiletest (like `x.py test src/test/ui`) when running `x.py` outside of the root source directory. For example, the CI builders do this, which causes a confusing warning message. This also fixes it so that passing a full path works (like `x.py test src/test/ui/hello.rs`) in the same scenario (previously it would just ignore the `hello.rs` part).
This commit is contained in:
Matthias Krüger 2022-01-28 15:20:29 +01:00 • committed by GitHub
commit 6baf25eeb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/util.rs
View file

@ -282,9 +282,10 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>(
if !path.starts_with(suite_path) {
return None;
}
let exists = path.is_dir() || path.is_file();
let abs_path = builder.src.join(path);
let exists = abs_path.is_dir() || abs_path.is_file();
if !exists {
if let Some(p) = path.to_str() {
if let Some(p) = abs_path.to_str() {
builder.info(&format!("Warning: Skipping \"{}\": not a regular file or directory", p));
}
return None;