Skip to content

Commit

Permalink
Fix running multiple targets.
Browse files Browse the repository at this point in the history
The aux dir, which previously had the `stage_id` embedded in it, was picking up remnants from previous runs.
  • Loading branch information
ehuss committed May 17, 2018
1 parent 6f414b1 commit b8473de
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1476,12 +1476,13 @@ impl<'test> TestCx<'test> {
}

fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {
let aux_dir = self.aux_output_dir_name();

if !self.props.aux_builds.is_empty() {
create_dir_all(&self.aux_output_dir_name()).unwrap();
let _ = fs::remove_dir_all(&aux_dir);
create_dir_all(&aux_dir).unwrap();
}

let aux_dir = self.aux_output_dir_name();

for rel_ab in &self.props.aux_builds {
let aux_testpaths = self.compute_aux_test_paths(rel_ab);
let aux_props =
Expand Down

0 comments on commit b8473de

Please sign in to comment.