diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-10-23 05:37:15 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-10-23 05:37:15 +0000 |
| commit | 624f68da16c2f105dd2d7b4e16bc476d0c53c2b9 (patch) | |
| tree | f4ab0ea057effbad3f343739705e55948a25ca60 /src/tools | |
| parent | a80b5c00b64a6ec8175a3153b174f59a237434a7 (diff) | |
| parent | f1a1ef68c7a6d588ba9faa20f3b2ecac4ef607c5 (diff) | |
| download | rust-624f68da16c2f105dd2d7b4e16bc476d0c53c2b9.tar.gz rust-624f68da16c2f105dd2d7b4e16bc476d0c53c2b9.zip | |
Merge from rustc
Diffstat (limited to 'src/tools')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/opt-dist/src/main.rs | 4 | ||||
| -rw-r--r-- | src/tools/opt-dist/src/tests.rs | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 8eb8acbb116e7923ea2ce33a50109933ed5ab37 +Subproject d2f6a048529eb8e9ebc55d793abd63456c98fac diff --git a/src/tools/opt-dist/src/main.rs b/src/tools/opt-dist/src/main.rs index 9cdff84676e..f9ff1a0a486 100644 --- a/src/tools/opt-dist/src/main.rs +++ b/src/tools/opt-dist/src/main.rs @@ -408,8 +408,8 @@ fn download_rustc_perf(env: &Environment) -> anyhow::Result<()> { // FIXME: add some mechanism for synchronization of this commit SHA with // Linux (which builds rustc-perf in a Dockerfile) - // rustc-perf version from 2023-05-30 - const PERF_COMMIT: &str = "8b2ac3042e1ff2c0074455a0a3618adef97156b1"; + // rustc-perf version from 2023-10-22 + const PERF_COMMIT: &str = "4f313add609f43e928e98132358e8426ed3969ae"; let url = format!("https://ci-mirrors.rust-lang.org/rustc/rustc-perf-{PERF_COMMIT}.zip"); let client = reqwest::blocking::Client::builder() diff --git a/src/tools/opt-dist/src/tests.rs b/src/tools/opt-dist/src/tests.rs index 8000c9e7fdd..3c33cfe985d 100644 --- a/src/tools/opt-dist/src/tests.rs +++ b/src/tools/opt-dist/src/tests.rs @@ -24,11 +24,10 @@ pub fn run_tests(env: &Environment) -> anyhow::Result<()> { let host_triple = env.host_triple(); 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 libstd_dir = extract_dist_dir(&format!("rust-std-{version}-{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"); // 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())); 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. // It doesn't really matter which LLVM config we choose, because no sysroot will be compiled. @@ -65,13 +62,11 @@ change-id = 115898 [build] rustc = "{rustc}" -cargo = "{cargo}" [target.{host_triple}] llvm-config = "{llvm_config}" "#, rustc = rustc_path.to_string().replace('\\', "/"), - cargo = cargo_path.to_string().replace('\\', "/"), llvm_config = llvm_config.to_string().replace('\\', "/") ); log::info!("Using following `config.toml` for running tests:\n{config_content}"); @@ -84,6 +79,8 @@ llvm-config = "{llvm_config}" env.python_binary(), x_py.as_str(), "test", + "--build", + env.host_triple(), "--stage", "0", "tests/assembly", |