Skip to content

Commit 64f828d

Browse files
authored
Unrolled build for #145405
Rollup merge of #145405 - durin42:test-cleanup-tmpdir, r=lqd cleanup: use run_in_tmpdir in run-make/rustdoc-scrape-examples-paths We had an issue on our LLVM-head Rust builder where it got stuck with this test failing because it was reusing the tmpdir between runs and something broke the incremental compile. Everything seems to work fine with run_in_tmpdir in this test. tests/run-make/uefi-qemu also uses the same tmpdir across runs, but I don't have the right environment to test that so I didn't try fixing it. That is the only use of std::env::temp_dir left in run-make tests after this fix.
2 parents b96868f + 79d3006 commit 64f828d

File tree

1 file changed

+8
-8
lines changed
  • tests/run-make/rustdoc-scrape-examples-paths

1 file changed

+8
-8
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
//! Test to ensure that the rustdoc `scrape-examples` feature is not panicking.
22
//! Regression test for <https://github.com/rust-lang/rust/issues/144752>.
33
4-
use run_make_support::{cargo, path, rfs};
4+
use run_make_support::cargo;
5+
use run_make_support::scoped_run::run_in_tmpdir;
56

67
fn main() {
78
// We copy the crate to be documented "outside" to prevent documenting
89
// the whole compiler.
9-
let tmp = std::env::temp_dir();
10-
let test_crate = tmp.join("foo");
11-
rfs::copy_dir_all(path("foo"), &test_crate);
12-
13-
// The `scrape-examples` feature is also implemented in `cargo` so instead of reproducing
14-
// what `cargo` does, better to just let `cargo` do it.
15-
cargo().current_dir(&test_crate).args(["doc", "-p", "foo", "-Zrustdoc-scrape-examples"]).run();
10+
std::env::set_current_dir("foo").unwrap();
11+
run_in_tmpdir(|| {
12+
// The `scrape-examples` feature is also implemented in `cargo` so instead of reproducing
13+
// what `cargo` does, better to just let `cargo` do it.
14+
cargo().args(["doc", "-p", "foo", "-Zrustdoc-scrape-examples"]).run();
15+
})
1616
}

0 commit comments

Comments
 (0)