mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unnecessary nesting in run-make test output directories

Browse Source
This commit is contained in:
Zalathar 2024-10-16 12:16:17 +11:00
parent e7c0d27507
commit 4cf0475eeb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/compiletest/src/runtest/run_make.rs
View File

@ -22,6 +22,10 @@ fn run_rmake_legacy_test(&self) {
let src_root = self.config.src_base.parent().unwrap().parent().unwrap(); let src_root = self.config.src_base.parent().unwrap().parent().unwrap();
let src_root = cwd.join(&src_root); 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()); let tmpdir = cwd.join(self.output_base_name());
if tmpdir.exists() { if tmpdir.exists() {
self.aggressive_rm_rf(&tmpdir).unwrap(); self.aggressive_rm_rf(&tmpdir).unwrap();
@ -213,7 +217,7 @@ fn run_rmake_v2_test(&self) {
// `rmake_out/` directory. // `rmake_out/` directory.
// //
// This setup intentionally diverges from legacy Makefile run-make tests. // 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() { if base_dir.exists() {
self.aggressive_rm_rf(&base_dir).unwrap(); self.aggressive_rm_rf(&base_dir).unwrap();
} }

2
tests/run-make/README.md
View File

@ -29,7 +29,7 @@ The setup for the `rmake.rs` version is a 3-stage process:
structure within `build/<target>/test/run-make/` structure within `build/<target>/test/run-make/`
``` ```
<test-name>/<test-name>/ <test-name>/
rmake.exe # recipe binary rmake.exe # recipe binary
rmake_out/ # sources from test sources copied over rmake_out/ # sources from test sources copied over
``` ```