Clear RUSTUP_* environment variables in test_env

Author: smoelius

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

@@ -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.

tests/testsuite/jobserver.rs

@@ -112,6 +112,7 @@ all:
     p.process(make).env("CARGO", cargo_exe()).arg("-j2").run();
 }
 
+#[allow(clippy::disallowed_methods)]
 #[cargo_test]
 fn runner_inherits_jobserver() {
     let make = make_exe();
@@ -196,7 +197,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")
@@ -206,14 +208,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")
@@ -223,8 +229,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")

tests/testsuite/utils/ext.rs

@@ -23,6 +23,9 @@ impl CargoProjectExt for Project {
         let cargo = cargo_exe();
         let mut execs = self.process(&cargo);
         execs.env("CARGO", cargo);
+        if let Some(val) = std::env::var_os("RUSTUP_HOME") {
+            execs.env("RUSTUP_HOME", val);
+        }
         execs.arg_line(cmd);
         execs
     }

tests/testsuite/utils/mod.rs

@@ -11,6 +11,9 @@ pub fn cargo_process(arg_line: &str) -> Execs {
     let cargo = cargo_exe();
     let mut p = process(&cargo);
     p.env("CARGO", cargo);
+    if let Some(val) = std::env::var_os("RUSTUP_HOME") {
+        p.env("RUSTUP_HOME", val);
+    }
     p.arg_line(arg_line);
     execs().with_process_builder(p)
 }