diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2024-10-16 12:16:17 +1100 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2024-10-16 12:40:25 +1100 |
| commit | 4cf0475eeb6fb3aca3b67cd16127d825709a0bb4 (patch) | |
| tree | 687d2cae7c5e38b5602900019decd0b6791df4e2 | |
| parent | e7c0d2750726c1f08b1de6956248ec78c4a97af6 (diff) | |
| download | rust-4cf0475eeb6fb3aca3b67cd16127d825709a0bb4.tar.gz rust-4cf0475eeb6fb3aca3b67cd16127d825709a0bb4.zip | |
Fix unnecessary nesting in run-make test output directories
| -rw-r--r-- | src/tools/compiletest/src/runtest/run_make.rs | 6 | ||||
| -rw-r--r-- | tests/run-make/README.md | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs index 75fe6a6baaf..f8ffd0fbe3f 100644 --- a/src/tools/compiletest/src/runtest/run_make.rs +++ b/src/tools/compiletest/src/runtest/run_make.rs @@ -22,6 +22,10 @@ impl TestCx<'_> { let src_root = self.config.src_base.parent().unwrap().parent().unwrap(); let src_root = cwd.join(&src_root); + // FIXME(Zalathar): This should probably be `output_base_dir` to avoid + // an unnecessary extra subdirectory, but since legacy Makefile tests + // are hopefully going away, it seems safer to leave this perilous code + // as-is until it can all be deleted. let tmpdir = cwd.join(self.output_base_name()); if tmpdir.exists() { self.aggressive_rm_rf(&tmpdir).unwrap(); @@ -213,7 +217,7 @@ impl TestCx<'_> { // `rmake_out/` directory. // // This setup intentionally diverges from legacy Makefile run-make tests. - let base_dir = self.output_base_name(); + let base_dir = self.output_base_dir(); if base_dir.exists() { self.aggressive_rm_rf(&base_dir).unwrap(); } diff --git a/tests/run-make/README.md b/tests/run-make/README.md index 9e1eaa881c9..40359903473 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 ``` |