Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 13:13:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #4115 - ehuss:fix-compiletest, r=Manishearth

Browse source 
Fix compile-test from forcing a rebuild.

If the `compile-test` test was run, then running a cargo build command immediately after caused everything to be rebuilt. This is because the `compile-test` test was deleting all `.rmeta` files in the target directory. Cargo recently switched to always generating `.rmeta` files (https://github.com/rust-lang/cargo/pull/6883), and when the files are deleted, it thinks it needs to be rebuilt.

I am not very familiar with compiletest or clippy, so please take a close look and test this out (with the most recent nightly). In particular, make sure it doesn't revert the fixes from #3380 (it seems to work for me). Also @oli-obk mentioned something related in https://github.com/rust-lang/rust/pull/60190#issuecomment-493617188, and I want to make sure that is addressed as well.

Fixes #4114
This commit is contained in:
bors 2019-05-19 20:44:19 +00:00
commit cbae9ed873
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/compile-test.rs
View file

@ -52,7 +52,7 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
// as we'll get a duplicate matching versions. Instead, disambiguate with // as we'll get a duplicate matching versions. Instead, disambiguate with
// `--extern dep=path`. // `--extern dep=path`.
// See https://github.com/rust-lang/rust-clippy/issues/4015. // See https://github.com/rust-lang/rust-clippy/issues/4015.
let needs_disambiguation = ["serde"]; let needs_disambiguation = ["serde", "regex", "clippy_lints"];
// This assumes that deps are compiled (they are for Cargo integration tests). // This assumes that deps are compiled (they are for Cargo integration tests).
let deps = std::fs::read_dir(host_libs().join("deps")).unwrap(); let deps = std::fs::read_dir(host_libs().join("deps")).unwrap();
let disambiguated = deps let disambiguated = deps
@ -62,7 +62,7 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
// NOTE: This only handles a single dep // NOTE: This only handles a single dep
// https://github.com/laumann/compiletest-rs/issues/101 // https://github.com/laumann/compiletest-rs/issues/101
needs_disambiguation.iter().find_map(|dep| { needs_disambiguation.iter().find_map(|dep| {
if name.starts_with(&format!("lib{}-", dep)) { if name.starts_with(&format!("lib{}-", dep)) && name.ends_with(".rlib") {
Some(format!("--extern {}={}", dep, path.display())) Some(format!("--extern {}={}", dep, path.display()))
} else { } else {
None None
@ -95,8 +95,6 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
fn run_mode(mode: &str, dir: PathBuf) { fn run_mode(mode: &str, dir: PathBuf) {
let cfg = config(mode, dir); let cfg = config(mode, dir);
// clean rmeta data, otherwise "cargo check; cargo test" fails (#2896)
cfg.clean_rmeta();
compiletest::run_tests(&cfg); compiletest::run_tests(&cfg);
} }