mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #117018 - Kobzol:opt-dist-cargo-stage0, r=lqd

Browse Source 
Use beta cargo in opt-dist

Using the new stage2 cargo caused issues when a backwards-incompatible change was made to cargo. This means that we won't be testing the LTO/1-CGU optimized cargo, but I don't think that's a big issue, as we primarily want to test the compiler.

Should fix [this](https://github.com/rust-lang/rust/pull/117000#issuecomment-1773639109) failure.
This commit is contained in:
bors 2023-10-22 16:10:03 +00:00
commit 3c92dcc6f3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/opt-dist/src/tests.rs
View File

@ -24,11 +24,10 @@ pub fn run_tests(env: &Environment) -> anyhow::Result<()> {
let host_triple = env.host_triple(); let host_triple = env.host_triple();
let version = find_dist_version(&dist_dir)?; let version = find_dist_version(&dist_dir)?;
// Extract rustc, libstd, cargo and src archives to create the optimized sysroot // Extract rustc, libstd and src archives to create the optimized sysroot
let rustc_dir = extract_dist_dir(&format!("rustc-{version}-{host_triple}"))?.join("rustc"); let rustc_dir = extract_dist_dir(&format!("rustc-{version}-{host_triple}"))?.join("rustc");
let libstd_dir = extract_dist_dir(&format!("rust-std-{version}-{host_triple}"))? let libstd_dir = extract_dist_dir(&format!("rust-std-{version}-{host_triple}"))?
.join(format!("rust-std-{host_triple}")); .join(format!("rust-std-{host_triple}"));
let cargo_dir = extract_dist_dir(&format!("cargo-{version}-{host_triple}"))?.join("cargo");
let extracted_src_dir = extract_dist_dir(&format!("rust-src-{version}"))?.join("rust-src"); let extracted_src_dir = extract_dist_dir(&format!("rust-src-{version}"))?.join("rust-src");
// We need to manually copy libstd to the extracted rustc sysroot // We need to manually copy libstd to the extracted rustc sysroot
@ -47,8 +46,6 @@ pub fn run_tests(env: &Environment) -> anyhow::Result<()> {
let rustc_path = rustc_dir.join("bin").join(format!("rustc{}", executable_extension())); let rustc_path = rustc_dir.join("bin").join(format!("rustc{}", executable_extension()));
assert!(rustc_path.is_file()); assert!(rustc_path.is_file());
let cargo_path = cargo_dir.join("bin").join(format!("cargo{}", executable_extension()));
assert!(cargo_path.is_file());
// Specify path to a LLVM config so that LLVM is not rebuilt. // Specify path to a LLVM config so that LLVM is not rebuilt.
// It doesn't really matter which LLVM config we choose, because no sysroot will be compiled. // It doesn't really matter which LLVM config we choose, because no sysroot will be compiled.
@ -65,13 +62,11 @@ change-id = 115898
[build] [build]
rustc = "{rustc}" rustc = "{rustc}"
cargo = "{cargo}"
[target.{host_triple}] [target.{host_triple}]
llvm-config = "{llvm_config}" llvm-config = "{llvm_config}"
"#, "#,
rustc = rustc_path.to_string().replace('\\', "/"), rustc = rustc_path.to_string().replace('\\', "/"),
cargo = cargo_path.to_string().replace('\\', "/"),
llvm_config = llvm_config.to_string().replace('\\', "/") llvm_config = llvm_config.to_string().replace('\\', "/")
); );
log::info!("Using following `config.toml` for running tests:\n{config_content}"); log::info!("Using following `config.toml` for running tests:\n{config_content}");
@ -84,6 +79,8 @@ llvm-config = "{llvm_config}"
env.python_binary(), env.python_binary(),
x_py.as_str(), x_py.as_str(),
"test", "test",
"--build",
env.host_triple(),
"--stage", "--stage",
"0", "0",
"tests/assembly", "tests/assembly",