diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-15 05:11:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 05:11:38 +0200 |
| commit | 258c17741b998b7b068593759935d374e8af7d13 (patch) | |
| tree | 5a5631cfc936efca4d6045e900c3f955a240d791 | |
| parent | bd649b4dd03a58ec1a1f90a441bb7ab697b34aba (diff) | |
| parent | c6e1fbf8ebbbec0d7b2deee86a1bc67ec98e1541 (diff) | |
| download | rust-258c17741b998b7b068593759935d374e8af7d13.tar.gz rust-258c17741b998b7b068593759935d374e8af7d13.zip | |
Rollup merge of #131681 - Zalathar:fix-run-make-stamp, r=jieyouxu
Fix up-to-date checking for run-make tests This special case in `output_base_dir` had the unfortunate side-effect of causing all run-make tests to share the same `stamp` file. So as soon as any one of them succeeded, all of the failed tests would be incorrectly considered up-to-date and would no longer run in subsequent test invocations. Fixes #129971. r? jieyouxu
| -rw-r--r-- | src/tools/compiletest/src/common.rs | 10 | ||||
| -rw-r--r-- | tests/run-make/README.md | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index a5418ad8384..1ee00a3a4e8 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -759,14 +759,8 @@ pub fn output_testname_unique( /// test/revision should reside. Example: /// /path/to/build/host-triple/test/ui/relative/testname.revision.mode/ pub fn output_base_dir(config: &Config, testpaths: &TestPaths, revision: Option<&str>) -> PathBuf { - // In run-make tests, constructing a relative path + unique testname causes a double layering - // since revisions are not supported, causing unnecessary nesting. - if config.mode == Mode::RunMake { - output_relative_path(config, &testpaths.relative_dir) - } else { - output_relative_path(config, &testpaths.relative_dir) - .join(output_testname_unique(config, testpaths, revision)) - } + output_relative_path(config, &testpaths.relative_dir) + .join(output_testname_unique(config, testpaths, revision)) } /// Absolute path to the base filename used as output for the given diff --git a/tests/run-make/README.md b/tests/run-make/README.md index 40359903473..9e1eaa881c9 100644 --- a/tests/run-make/README.md +++ b/tests/run-make/README.md @@ -29,7 +29,7 @@ The setup for the `rmake.rs` version is a 3-stage process: structure within `build/<target>/test/run-make/` ``` - <test-name>/ + <test-name>/<test-name>/ rmake.exe # recipe binary rmake_out/ # sources from test sources copied over ``` |