Skip to content

Commit beff457

Browse files
committed
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 considered up-to-date and would no longer run in subsequent test invocations.
1 parent f6648f2 commit beff457

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/tools/compiletest/src/common.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -759,14 +759,7 @@ pub fn output_testname_unique(
759759
/// test/revision should reside. Example:
760760
/// /path/to/build/host-triple/test/ui/relative/testname.revision.mode/
761761
pub fn output_base_dir(config: &Config, testpaths: &TestPaths, revision: Option<&str>) -> PathBuf {
762-
// In run-make tests, constructing a relative path + unique testname causes a double layering
763-
// since revisions are not supported, causing unnecessary nesting.
764-
if config.mode == Mode::RunMake {
765-
output_relative_path(config, &testpaths.relative_dir)
766-
} else {
767-
output_relative_path(config, &testpaths.relative_dir)
768-
.join(output_testname_unique(config, testpaths, revision))
769-
}
762+
output_relative_path(config, &testpaths.relative_dir)
770763
}
771764

772765
/// Absolute path to the base filename used as output for the given

0 commit comments

Comments
 (0)