diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-03-22 19:30:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 19:30:26 -0400 |
| commit | d4f296f03b2dbb62720f8ad358deee223c96ce7d (patch) | |
| tree | 41861e4fd1b4e3972c3ef4e4d93868b6cb9e30b6 | |
| parent | fde69411dc1bf6bf38a2a71903335dd1a233544c (diff) | |
| parent | cbb3af1e9c02bcb7c84a05bbcdb250e3e45c453c (diff) | |
| download | rust-d4f296f03b2dbb62720f8ad358deee223c96ce7d.tar.gz rust-d4f296f03b2dbb62720f8ad358deee223c96ce7d.zip | |
Rollup merge of #40578 - michaelwoerister:shorter-compiletest-stamps, r=alexcrichton
Make the filenames of .stamp files generated by compiletest shorter Otherwise we run into filename length limitations on some file systems. See https://bugs.launchpad.net/ecryptfs/+bug/344878 for an example where we only can have ~145 characters for filenames. r? @alexcrichton
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 5a97f7e3ee9..657739c65b1 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -486,11 +486,9 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn } fn stamp(config: &Config, testpaths: &TestPaths) -> PathBuf { - let stamp_name = format!("{}-H-{}-T-{}-S-{}.stamp", + let stamp_name = format!("{}-{}.stamp", testpaths.file.file_name().unwrap() .to_str().unwrap(), - config.host, - config.target, config.stage_id); config.build_base.canonicalize() .unwrap_or(config.build_base.clone()) |