Merge rust-lang#3380

3380: compiletest: clean rmeta data (from "cargo check") before running compiletest r=phansch a=matthiaskrgr Fixes rust-lang#2896 Fixes rust-lang#2139 Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
matthiaskrgr · Oct 29, 2018 · 3971c42 · 3971c42
2 parents e2df3e2 + be7656d
commit 3971c42
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
@@ -75,7 +75,10 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
 }
 
 fn run_mode(mode: &str, dir: PathBuf) {
-    compiletest::run_tests(&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);
 }
 
 fn run_ui_toml_tests(config: &compiletest::Config, mut tests: Vec<test::TestDescAndFn>) -> Result<bool, io::Error> {