about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2018-10-29 10:27:40 +0100
committerMatthias Krüger <matthias.krueger@famsik.de>2018-10-29 12:29:40 +0100
commitbe7656d9928b6e07fe19eed6938f6cf5316f2de0 (patch)
treea5c17a048cb09e75987a3c578786b35af413ae41
parent00ed70526a90508368bec3a8b0b49b0f93b5150d (diff)
downloadrust-be7656d9928b6e07fe19eed6938f6cf5316f2de0.tar.gz
rust-be7656d9928b6e07fe19eed6938f6cf5316f2de0.zip
compiletest: clean rmeta data (from "cargo check") before running compiletest.
Fixes #2896
Fixes #2139
-rw-r--r--tests/compile-test.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index c9d4f658935..64360af641b 100644
--- 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> {