Skip to content

Commit b6581d3

Browse files
committed
Auto merge of #6857 - ehuss:fix-new_warning_with_corrupt_ws, r=alexcrichton
Fix new_warning_with_corrupt_ws missing "USER". Also removed USER in all invocations to avoid this in the future.
2 parents 73ed6a5 + 03932d6 commit b6581d3

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

tests/testsuite/support/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
16791679
.env_remove("XDG_CONFIG_HOME") // see #2345
16801680
.env("GIT_CONFIG_NOSYSTEM", "1") // keep trying to sandbox ourselves
16811681
.env_remove("EMAIL")
1682+
.env_remove("USER") // not set on some rust-lang docker images
16821683
.env_remove("MFLAGS")
16831684
.env_remove("MAKEFLAGS")
16841685
.env_remove("CARGO_MAKEFLAGS")

tests/testsuite/workspaces.rs

+1
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@ root: [..]
992992
fn new_warning_with_corrupt_ws() {
993993
let p = project().file("Cargo.toml", "asdf").build();
994994
p.cargo("new bar")
995+
.env("USER", "foo")
995996
.with_stderr(
996997
"\
997998
[WARNING] compiling this new crate may not work due to invalid workspace configuration

0 commit comments

Comments
 (0)