Skip to content

Commit 92942a6

Browse files
committed
Set RUSTUP_TOOLCHAIN_SOURCE in rustup tests
1 parent bc4bdca commit 92942a6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

tests/testsuite/rustup.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ fn typical_rustup() {
198198
// `~/.cargo/bin/rustc to use our custom rustup proxies.
199199
let path = prepend_path(&cargo_bin);
200200
p.cargo("check")
201+
.env("RUSTUP_TOOLCHAIN_SOURCE", "default")
201202
.env("RUSTUP_TOOLCHAIN", "test-toolchain")
202203
.env("RUSTUP_HOME", &rustup_home)
203204
.env("PATH", &path)
@@ -215,6 +216,7 @@ real rustc running
215216
p.build_dir().rm_rf();
216217

217218
p.cargo("check")
219+
.env("RUSTUP_TOOLCHAIN_SOURCE", "default")
218220
.env("RUSTUP_TOOLCHAIN", "test-toolchain")
219221
.env("RUSTUP_HOME", &rustup_home)
220222
.env("PATH", &path)
@@ -285,6 +287,7 @@ fn custom_calls_other_cargo() {
285287
// Set these to simulate what would happen when running under rustup.
286288
// We want to make sure that cargo-custom does not try to use the
287289
// rustup proxies.
290+
.env("RUSTUP_TOOLCHAIN_SOURCE", "default")
288291
.env("RUSTUP_TOOLCHAIN", "test-toolchain")
289292
.env("RUSTUP_HOME", &rustup_home)
290293
.with_stderr_data(str![[r#"

0 commit comments

Comments
 (0)