runtest: fix mir directory and delete outdated MIR files

This commit is contained in:
Niko Matsakis
2017-10-31 11:41:42 -04:00
parent 7675ea997a
commit 99aa313636
+4 -5
View File
@@ -1404,6 +1404,7 @@ fn make_compile_args(&self, input_file: &Path, output_file: TargetLocation) -> C
"-Zdump-mir-exclude-pass-number"]);
let mir_dump_dir = self.get_mir_dump_dir();
let _ = fs::remove_dir_all(&mir_dump_dir);
create_dir_all(mir_dump_dir.as_path()).unwrap();
let mut dir_opt = "-Zdump-mir-dir=".to_string();
dir_opt.push_str(mir_dump_dir.to_str().unwrap());
@@ -2367,12 +2368,10 @@ fn compare_mir_test_output(&self, test_name: &str, expected_content: &[ExpectedL
}
fn get_mir_dump_dir(&self) -> PathBuf {
let mut mir_dump_dir = PathBuf::from(self.config.build_base
.as_path()
.to_str()
.unwrap());
let mut mir_dump_dir = PathBuf::from(self.config.build_base.as_path());
debug!("input_file: {:?}", self.testpaths.file);
mir_dump_dir.push(self.testpaths.file.file_stem().unwrap().to_str().unwrap());
mir_dump_dir.push(&self.testpaths.relative_dir);
mir_dump_dir.push(self.testpaths.file.file_stem().unwrap());
mir_dump_dir
}