Skip to content

Clear RUSTUP_* environment variables in test_env #16469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoelius wants to merge 1 commit into
base: master
Choose a base branch
from
+66 −28
Open

Clear RUSTUP_* environment variables in test_env #16469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions crates/cargo-test-support/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,11 @@ pub trait TestEnvCommandExt: Sized {
self = self.env_remove(&k);
}
}
for (k, _v) in env::vars() {
if k.starts_with("RUSTUP_") {
self = self.env_remove(&k);
}
}
if env::var_os("RUSTUP_TOOLCHAIN").is_some() {
// Override the PATH to avoid executing the rustup wrapper thousands
// of times. This makes the testsuite run substantially faster.
Expand Down
22 changes: 14 additions & 8 deletions tests/testsuite/cargo_alias_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,17 @@ fn builtin_alias_shadowing_external_subcommand() {
paths.push(p.root());
let path = env::join_paths(paths).unwrap();

p.cargo("t")
.env("PATH", &path)
.with_stderr_data(str![[r#"
let mut process = p.cargo("t");
process.env("PATH", &path).with_stderr_data(str![[r#"
[COMPILING] foo v0.5.0 ([ROOT]/foo)
[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] unittests src/main.rs (target/debug/deps/foo-[HASH][EXE])

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
}

#[cargo_test]
Expand All @@ -181,7 +183,8 @@ fn alias_shadowing_external_subcommand() {
paths.push(echo.target_debug_dir());
let path = env::join_paths(paths).unwrap();

p.cargo("echo")
let mut process = p.cargo("echo");
process
.env("PATH", &path)
.with_stderr_data(str![[r#"
[WARNING] user-defined alias `echo` is shadowing an external subcommand found at `[ROOT]/cargo-echo/target/debug/cargo-echo[EXE]`
Expand All @@ -190,8 +193,11 @@ fn alias_shadowing_external_subcommand() {
[COMPILING] foo v0.5.0 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
}

#[cargo_test]
Expand Down
17 changes: 12 additions & 5 deletions tests/testsuite/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ fn multiple_pkgs_path_set() {
let mut path = path();
path.push(paths::cargo_home().join("bin"));
let new_path = env::join_paths(path).unwrap();
cargo_process("install foo bar baz")
let mut process = cargo_process("install foo bar baz");
process
.env("PATH", new_path)
.with_status(101)
.with_stderr_data(str![[r#"
Expand All @@ -303,8 +304,11 @@ fn multiple_pkgs_path_set() {
[SUMMARY] Successfully installed foo, bar! Failed to install baz (see error(s) above).
[ERROR] some crates failed to install

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
assert_has_installed_exe(paths::cargo_home(), "foo");
assert_has_installed_exe(paths::cargo_home(), "bar");

Expand Down Expand Up @@ -645,8 +649,11 @@ fn relative_install_location_with_path_set() {
[INSTALLING] [ROOT]/foo/t1/bin/foo[EXE]
[INSTALLED] package `foo v0.0.1 ([ROOT]/foo)` (executable `foo[EXE]`)

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
cmd.env("RUSTUP_HOME", val);
}
cmd.run();

assert_has_installed_exe(&project_t1, "foo");
}
Expand Down
40 changes: 28 additions & 12 deletions tests/testsuite/jobserver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ test-runner:
.arg("run")
.arg("-j2")
.run();
p.process(make)
let mut process = p.process(make);
process
.env("PATH", path)
.env("CARGO", cargo_exe())
.arg("run-runner")
Expand All @@ -206,14 +207,18 @@ test-runner:
[RUNNING] `runner target/debug/cargo-jobserver-check[EXE]`
this is a runner

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
p.process(make)
.env("CARGO", cargo_exe())
.arg("test")
.arg("-j2")
.run();
p.process(make)
let mut process = p.process(make);
process
.env("PATH", path)
.env("CARGO", cargo_exe())
.arg("test-runner")
Expand All @@ -223,8 +228,11 @@ this is a runner
[RUNNING] unittests src/lib.rs (target/debug/deps/cargo_jobserver_check-[HASH][EXE])
this is a runner

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();

// but not from `-j` flag
p.cargo("run -j2")
Expand All @@ -238,7 +246,8 @@ this is a runner

"#]])
.run();
p.cargo("run -j2")
let mut process = p.cargo("run -j2");
process
.env("PATH", path)
.arg("--config")
.arg(config_value)
Expand All @@ -251,13 +260,17 @@ this is a runner
[..]no jobserver from env[..]
...

"#]])
.run();
"#]]);
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
p.cargo("test -j2")
.with_status(101)
.with_stdout_data("...\n[..]no jobserver from env[..]\n...")
.run();
p.cargo("test -j2")
let mut process = p.cargo("test -j2");
process
.env("PATH", path)
.arg("--config")
.arg(config_value)
Expand All @@ -269,8 +282,11 @@ this is a runner
...

"#]])
.with_stdout_data("...\n[..]no jobserver from env[..]\n...")
.run();
.with_stdout_data("...\n[..]no jobserver from env[..]\n...");
if let Some(val) = env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
}

#[cargo_test]
Expand Down
10 changes: 7 additions & 3 deletions tests/testsuite/script/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ fn manifest_precedence_over_plugins() {
path.push(p.root().join("path-test"));
let path = std::env::join_paths(path.iter()).unwrap();

p.cargo("-Zscript -v echo.rs")
let mut process = p.cargo("-Zscript -v echo.rs");
process
.env("PATH", &path)
.masquerade_as_nightly_cargo(&["script"])
.with_stdout_data(str![[r#"
Expand All @@ -176,8 +177,11 @@ args: []
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[RUNNING] `[ROOT]/home/.cargo/build/[HASH]/target/debug/echo[EXE]`

"#]])
.run();
"#]]);
if let Some(val) = std::env::var_os("RUSTUP_HOME") {
process.env("RUSTUP_HOME", val);
}
process.run();
}

#[cfg(unix)]
Expand Down
Loading