Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-28 20:16:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #5662 - ebroto:cargo_tests_invalid_crate, r=flip1995

Browse Source 
cargo-ui tests: check that <dir>/src exists before processing test

I forgot that I had fixed this in a PR I closed some days ago (#5643).

Before this change, cargo UI tests could fail when switching between branches if the previous branch had a test that the current branch does not have. The directory is not removed when switching because an ignored `Cargo.lock` file exists, and the code was trying to reach `$DIR/src` unconditionally.

This change will just skip a directory that has no `src` subdirectory.

changelog: none
This commit is contained in:
bors
2020-05-31 19:12:00 +00:00
parent 9fdcb13edb 14e9100543
commit 9f9877c47f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/compile-test.rs
+8 -1
View File
@@ -181,8 +181,15 @@ fn run_tests(
}
let src_path = case.path().join("src");
env::set_current_dir(&src_path)?;
// When switching between branches, if the previous branch had a test
// that the current branch does not have, the directory is not removed
// because an ignored Cargo.lock file exists.
if !src_path.exists() {
continue;
}
env::set_current_dir(&src_path)?;
for file in fs::read_dir(&src_path)? {
let file = file?;
if file.file_type()?.is_dir() {