about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRyan Prichard <ryan.prichard@gmail.com>2015-04-22 19:01:42 -0700
committerRyan Prichard <ryan.prichard@gmail.com>2015-04-22 20:32:14 -0700
commit38d26d811a44ba93637c84ce77a58af88c47f0ac (patch)
tree1da1692be3253913ea7e05d2c9a58908b058ef88
parent89b6f397c58db87bfcc976cafb75324b2278c171 (diff)
downloadrust-38d26d811a44ba93637c84ce77a58af88c47f0ac.tar.gz
rust-38d26d811a44ba93637c84ce77a58af88c47f0ac.zip
Include the mode in compiletest's aux-build directory.
The run-pass and pretty run-pass tests could run concurrently, and if they
do, they need to keep their output segregated.

This change might be overkill. We need the suffix for the `pretty` mode,
but we might not need it otherwise. The `debuginfo-lldb` and
`debuginfo-gdb` modes look like they could also need it, but the current
`tests.mk` file happens not to enable both lldb and gdb at the same time,
for incidental reasons.
-rw-r--r--src/compiletest/runtest.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 8ae36393182..f528a0505e4 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1452,7 +1452,7 @@ fn make_out_name(config: &Config, testfile: &Path, extension: &str) -> PathBuf {
 fn aux_output_dir_name(config: &Config, testfile: &Path) -> PathBuf {
     let f = output_base_name(config, testfile);
     let mut fname = f.file_name().unwrap().to_os_string();
-    fname.push("libaux");
+    fname.push(&format!(".{}.libaux", config.mode));
     f.with_file_name(&fname)
 }