diff options
| author | Eric Huss <eric@huss.org> | 2018-05-12 22:18:55 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2018-05-16 22:25:20 -0700 |
| commit | b8473de7b9309b750fdfafa8f40f3e7302e056f3 (patch) | |
| tree | 9b98fcf0997068502158ce426e102c9834ffa751 /src | |
| parent | 6f414b1408c004e32387d7fb563a9cc5cab28526 (diff) | |
| download | rust-b8473de7b9309b750fdfafa8f40f3e7302e056f3.tar.gz rust-b8473de7b9309b750fdfafa8f40f3e7302e056f3.zip | |
Fix running multiple targets.
The aux dir, which previously had the `stage_id` embedded in it, was picking up remnants from previous runs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 2a76113460f..59d94e1fa51 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -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 = |
