Skip to content

Commit be2e807

Browse files
authored
Rollup merge of #110356 - jyn514:rust-installer-tests, r=ozkanonur
Fix `x test rust-installer` when `cargo` is set to a relative path Previously, this would give an error because the shell script had a different working directory: ``` test: basic_install $ sh /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh --image-dir=/home/jyn/src/rust/src/tools/rust-installer/test/image1 --work-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/workdir --output-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/outdir /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh: 15: ../rust3/build/host/stage2-tools-bin/cargo: not found TEST FAILED! ```
2 parents 724da5c + b1feb45 commit be2e807

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Diff for: src/bootstrap/config.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,9 @@ impl Config {
10091009
});
10101010
config.initial_cargo = build
10111011
.cargo
1012-
.map(PathBuf::from)
1012+
.map(|cargo| {
1013+
t!(PathBuf::from(cargo).canonicalize(), "`initial_cargo` not found on disk")
1014+
})
10131015
.unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/cargo"));
10141016

10151017
// NOTE: it's important this comes *after* we set `initial_rustc` just above.

0 commit comments

Comments
 (0)