Skip to content

Commit

Permalink
Auto merge of #8168 - ecstatic-morse:future-proof-test, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Apr 27, 2020
2 parents 2ba9df5 + cf57ce1 commit a0a14f2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions crates/cargo-test-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1723,6 +1723,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
.env_remove("RUSTDOC")
.env_remove("RUSTC_WRAPPER")
.env_remove("RUSTFLAGS")
.env_remove("RUSTDOCFLAGS")
.env_remove("XDG_CONFIG_HOME") // see #2345
.env("GIT_CONFIG_NOSYSTEM", "1") // keep trying to sandbox ourselves
.env_remove("EMAIL")
Expand Down

0 comments on commit a0a14f2

Please sign in to comment.