about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-22 10:43:48 +0000
committerbors <bors@rust-lang.org>2023-08-22 10:43:48 +0000
commitb2e9d73606f4d4d9edf8e7591607465ea6b913d4 (patch)
tree9e663421b4a90ffd7fd052e2f274e8674b1facde
parent95305899b8493a65065ebdeae44e841d243621eb (diff)
parent28de139d3545ec7e98dcb0e56349c0d5af0c3909 (diff)
downloadrust-b2e9d73606f4d4d9edf8e7591607465ea6b913d4.tar.gz
rust-b2e9d73606f4d4d9edf8e7591607465ea6b913d4.zip
Auto merge of #115086 - RalfJung:miri-locked, r=albertlarsan68
bootstrap/miri: respect config_locked_deps
-rw-r--r--src/bootstrap/test.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index d0d62db0807..db3b7ffbea4 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -630,6 +630,10 @@ impl Step for Miri {
         cargo.env("MIRI_SYSROOT", &miri_sysroot);
         cargo.env("MIRI_HOST_SYSROOT", sysroot);
         cargo.env("MIRI", &miri);
+        if builder.config.locked_deps {
+            // enforce lockfiles
+            cargo.env("CARGO_EXTRA_FLAGS", "--locked");
+        }
 
         // Set the target.
         cargo.env("MIRI_TEST_TARGET", target.rustc_target_arg());
@@ -675,6 +679,9 @@ impl Step for Miri {
         );
         cargo.add_rustc_lib_path(builder, compiler);
         cargo.arg("--").arg("miri").arg("test");
+        if builder.config.locked_deps {
+            cargo.arg("--locked");
+        }
         cargo
             .arg("--manifest-path")
             .arg(builder.src.join("src/tools/miri/test-cargo-miri/Cargo.toml"));