diff options
author | bors <bors@rust-lang.org> | 2017-11-05 06:42:17 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2017-11-05 06:42:17 +0000 |
commit | 16e9b9f15cc405cfccc4469216b8711abbeae9d5 (patch) | |
tree | 49fb0505c79c1059d30de6b6cc2ed2596b80e01b | |
parent | 44183f50bcba16249487342fb869c3ae6d4c141a (diff) | |
parent | d588f9338da3f29f03216e2f2685df5b7ad3d0b3 (diff) | |
download | rust-16e9b9f15cc405cfccc4469216b8711abbeae9d5.tar.gz |
Auto merge of #45748 - petrochenkov:short, r=alexcrichton
Shorten paths to auxiliary files created by tests
I'm hitting issues with long file paths to object files created by the test suite, similar to https://github.com/rust-lang/rust/issues/45103#issuecomment-335622075.
If we look at the object file path in https://github.com/rust-lang/rust/issues/45103 we can see that the patch contains of few components:
```
specialization-cross-crate-defaults.stage2-x86_64-pc-windows-gnu.run-pass.libaux\specialization_cross_crate_defaults.specialization_cross_crate_defaults0.rust-cgu.o
```
=>
1. specialization-cross-crate-defaults // test name, required
2. stage2 // stage disambiguator, required
3. x86_64-pc-windows-gnu // target disambiguator, required
4. run-pass // mode disambiguator, rarely required
5. libaux // suffix, can be shortened
6. specialization_cross_crate_defaults // required, there may be several libraries in the directory
7. specialization_cross_crate_defaults0 // codegen unit name, can be shortened?
8. rust-cgu // suffix, can be shortened?
9. o // object file extension
This patch addresses items `4`, `5` and `8`.
`libaux` is shortened to `aux`, `rust-cgu` is shortened to `rcgu`, mode disambiguator is omitted unless it's necessary (for pretty-printing and debuginfo tests, see https://github.com/rust-lang/rust/pull/24537/commits/38d26d811a44ba93637c84ce77a58af88c47f0ac)
I haven't touched names of codegen units though (`specialization_cross_crate_defaults0`).
Is it useful for them to have descriptive names including the crate name, as opposed to just `0` or `cgu0` or something?
-rw-r--r-- | src/librustc/session/config.rs | 2 | ||||
-rw-r--r-- | src/librustc_trans/back/link.rs | 2 | ||||
-rw-r--r-- | src/test/run-make/extra-filename-with-temp-outputs/Makefile | 2 | ||||
-rw-r--r-- | src/tools/compiletest/src/common.rs | 14 | ||||
-rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 0f8312abc3f..8401d493b9d 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -410,7 +410,7 @@ impl_stable_hash_for!(struct self::OutputFilenames { outputs }); -pub const RUST_CGU_EXT: &str = "rust-cgu"; +pub const RUST_CGU_EXT: &str = "rcgu"; impl OutputFilenames { pub fn path(&self, flavor: OutputType) -> PathBuf { diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index b203bd640cf..907693ea8a3 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -1222,7 +1222,7 @@ fn add_upstream_rust_crates(cmd: &mut Linker, let canonical = f.replace("-", "_"); let canonical_name = name.replace("-", "_"); - // Look for `.rust-cgu.o` at the end of the filename to conclude + // Look for `.rcgu.o` at the end of the filename to conclude // that this is a Rust-related object file. fn looks_like_rust(s: &str) -> bool { let path = Path::new(s); diff --git a/src/test/run-make/extra-filename-with-temp-outputs/Makefile b/src/test/run-make/extra-filename-with-temp-outputs/Makefile index 13ca397eaf2..6de4f97df0c 100644 --- a/src/test/run-make/extra-filename-with-temp-outputs/Makefile +++ b/src/test/run-make/extra-filename-with-temp-outputs/Makefile @@ -2,5 +2,5 @@ all: $(RUSTC) -C extra-filename=bar foo.rs -C save-temps - rm $(TMPDIR)/foobar.foo0.rust-cgu.o + rm $(TMPDIR)/foobar.foo0.rcgu.o rm $(TMPDIR)/$(call BIN,foobar) diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index aa98f818f40..660462ad419 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -34,6 +34,20 @@ pub enum Mode { MirOpt, } +impl Mode { + pub fn disambiguator(self) -> &'static str { + // Run-pass and pretty run-pass tests could run concurrently, and if they do, + // they need to keep their output segregated. Same is true for debuginfo tests that + // can be run both on gdb and lldb. + match self { + Pretty => ".pretty", + DebugInfoGdb => ".gdb", + DebugInfoLldb => ".lldb", + _ => "", + } + } +} + impl FromStr for Mode { type Err = (); fn from_str(s: &str) -> Result<Mode, ()> { diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 42e52ceea69..de96aa9cdeb 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1565,7 +1565,7 @@ actual:\n\ fn aux_output_dir_name(&self) -> PathBuf { let f = self.output_base_name(); let mut fname = f.file_name().unwrap().to_os_string(); - fname.push(&format!(".{}.libaux", self.config.mode)); + fname.push(&format!("{}.aux", self.config.mode.disambiguator())); f.with_file_name(&fname) } |