diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-09-21 07:22:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-21 07:22:48 +0200 |
| commit | 43366285f48a3e22ca48e5b4b6bce4632a751c4b (patch) | |
| tree | a1e222bb78c4b6560e1167cf3e1a4586e3aa93e9 /tests | |
| parent | 28ace83b11d3e39904e87cefefb0274499975c08 (diff) | |
| parent | 4e53640b17fd65765abe0adca34c7d5eedf241c6 (diff) | |
| download | rust-43366285f48a3e22ca48e5b4b6bce4632a751c4b.tar.gz rust-43366285f48a3e22ca48e5b4b6bce4632a751c4b.zip | |
Rollup merge of #130642 - cuviper:run-make-cargo, r=jieyouxu
Pass the current cargo to `run-make` tests A couple tests were using `BOOTSTRAP_CARGO` with `-Zbuild-std`, but that stage0 cargo might not always be in sync with in-tree changes. In particular, those tests started failing on the beta branch because the older cargo couldn't find the library `Cargo.lock`, and then couldn't build the latest version of `compiler_builtins` that had nightly changes. Fixes #130634 r? `@saethlin`
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run-make/compiler-builtins/rmake.rs | 4 | ||||
| -rw-r--r-- | tests/run-make/thumb-none-cortex-m/rmake.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/run-make/compiler-builtins/rmake.rs b/tests/run-make/compiler-builtins/rmake.rs index 42ed07d9daf..3b05fe2055c 100644 --- a/tests/run-make/compiler-builtins/rmake.rs +++ b/tests/run-make/compiler-builtins/rmake.rs @@ -33,8 +33,8 @@ fn main() { let path = env_var("PATH"); let rustc = env_var("RUSTC"); - let bootstrap_cargo = env_var("BOOTSTRAP_CARGO"); - let mut cmd = cmd(bootstrap_cargo); + let cargo = env_var("CARGO"); + let mut cmd = cmd(cargo); cmd.args(&[ "build", "--manifest-path", diff --git a/tests/run-make/thumb-none-cortex-m/rmake.rs b/tests/run-make/thumb-none-cortex-m/rmake.rs index 0ddb91d378f..9112646290f 100644 --- a/tests/run-make/thumb-none-cortex-m/rmake.rs +++ b/tests/run-make/thumb-none-cortex-m/rmake.rs @@ -36,10 +36,10 @@ fn main() { let path = env_var("PATH"); let rustc = env_var("RUSTC"); - let bootstrap_cargo = env_var("BOOTSTRAP_CARGO"); - // FIXME: extract bootstrap cargo invocations to a proper command + let cargo = env_var("CARGO"); + // FIXME: extract cargo invocations to a proper command // https://github.com/rust-lang/rust/issues/128734 - let mut cmd = cmd(bootstrap_cargo); + let mut cmd = cmd(cargo); cmd.args(&[ "build", "--manifest-path", |