Skip to content

Commit b8473de

Browse files
committed
Fix running multiple targets.
The aux dir, which previously had the `stage_id` embedded in it, was picking up remnants from previous runs.
1 parent 6f414b1 commit b8473de

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/tools/compiletest/src/runtest.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1476,12 +1476,13 @@ impl<'test> TestCx<'test> {
14761476
}
14771477

14781478
fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {
1479+
let aux_dir = self.aux_output_dir_name();
1480+
14791481
if !self.props.aux_builds.is_empty() {
1480-
create_dir_all(&self.aux_output_dir_name()).unwrap();
1482+
let _ = fs::remove_dir_all(&aux_dir);
1483+
create_dir_all(&aux_dir).unwrap();
14811484
}
14821485

1483-
let aux_dir = self.aux_output_dir_name();
1484-
14851486
for rel_ab in &self.props.aux_builds {
14861487
let aux_testpaths = self.compute_aux_test_paths(rel_ab);
14871488
let aux_props =

0 commit comments

Comments
 (0)