Skip to content

Commit a0a14f2

Browse files
committed
Auto merge of #8168 - ecstatic-morse:future-proof-test, r=alexcrichton
Clear `RUSTDOCFLAGS` before running tests It turns out that this test will fail if `RUSTDOCFLAGS` is set in the test runner. This was found in rust-lang/rust#71458 (comment) when that PR attempted to set the proper `RUSTDOCFLAGS` to enable `./x.py doc --stage 0 src/libstd`. Run the test with no `RUSTDOCFLAGS` so that the config file always gets used.
2 parents 2ba9df5 + cf57ce1 commit a0a14f2

File tree

1 file changed

+1
-0
lines changed
  • crates/cargo-test-support/src

1 file changed

+1
-0
lines changed

crates/cargo-test-support/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
17231723
.env_remove("RUSTDOC")
17241724
.env_remove("RUSTC_WRAPPER")
17251725
.env_remove("RUSTFLAGS")
1726+
.env_remove("RUSTDOCFLAGS")
17261727
.env_remove("XDG_CONFIG_HOME") // see #2345
17271728
.env("GIT_CONFIG_NOSYSTEM", "1") // keep trying to sandbox ourselves
17281729
.env_remove("EMAIL")

0 commit comments

Comments
 (0)