Skip to content

Commit 18a46be

Browse files
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.
2 parents 6c92908 + 590c373 commit 18a46be

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/tools/compiletest/src/runtest.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3443,13 +3443,13 @@ impl<'test> TestCx<'test> {
34433443
// ```
34443444
// base_dir/
34453445
// rmake.exe
3446-
// scratch/
3446+
// rmake_out/
34473447
// ```
3448-
// having the executable separate from the scratch directory allows the recipes to
3449-
// `remove_dir_all(scratch)` without running into permission denied issues because
3450-
// the executable is not under the `scratch/` directory.
3448+
// having the executable separate from the output artifacts directory allows the recipes to
3449+
// `remove_dir_all($TMPDIR)` without running into permission denied issues because
3450+
// the executable is not under the `rmake_out/` directory.
34513451
//
3452-
// This setup diverges from legacy Makefile run-make tests.
3452+
// This setup intentionally diverges from legacy Makefile run-make tests.
34533453
let base_dir = cwd.join(self.output_base_name());
34543454
if base_dir.exists() {
34553455
self.aggressive_rm_rf(&base_dir).unwrap();

0 commit comments

Comments
 (0)