Merge #3380

bors[bot] · matthiaskrgr · bors[bot] · commit 3971c42458e1 · 2018-10-29T11:45:03.000Z
3380: compiletest: clean rmeta data (from "cargo check") before running compiletest r=phansch a=matthiaskrgr Fixes #2896 Fixes #2139 Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
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> {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,10 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`fn run_mode(mode: &str, dir: PathBuf) {`
`78`		`- compiletest::run_tests(&config(mode, dir));`
	`78`	`+ let cfg = config(mode, dir);`
	`79`	`+ // clean rmeta data, otherwise "cargo check; cargo test" fails (#2896)`
	`80`	`+ cfg.clean_rmeta();`
	`81`	`+ compiletest::run_tests(&cfg);`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`fn run_ui_toml_tests(config: &compiletest::Config, mut tests: Vec<test::TestDescAndFn>) -> Result<bool, io::Error> {`