Skip to content

Commit

Permalink
Unrolled build for rust-lang#125896
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125896 - jieyouxu:compiletest-rmake-comment, r=compiler-errors

compiletest: fix outdated rmake.rs comment

Noticed in rust-lang#125827 (comment). I fixed the PR description but forgot to update the comment.
  • Loading branch information
rust-timer authored Jun 3, 2024
2 parents a6416d8 + 590c373 commit 95572b3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3435,13 +3435,13 @@ impl<'test> TestCx<'test> {
// ```
// base_dir/
// rmake.exe
// scratch/
// rmake_out/
// ```
// having the executable separate from the scratch directory allows the recipes to
// `remove_dir_all(scratch)` without running into permission denied issues because
// the executable is not under the `scratch/` directory.
// having the executable separate from the output artifacts directory allows the recipes to
// `remove_dir_all($TMPDIR)` without running into permission denied issues because
// the executable is not under the `rmake_out/` directory.
//
// This setup diverges from legacy Makefile run-make tests.
// This setup intentionally diverges from legacy Makefile run-make tests.
let base_dir = cwd.join(self.output_base_name());
if base_dir.exists() {
self.aggressive_rm_rf(&base_dir).unwrap();
Expand Down

0 comments on commit 95572b3

Please sign in to comment.