Skip to content

Commit b2e9d73

Browse files
committed
Auto merge of rust-lang#115086 - RalfJung:miri-locked, r=albertlarsan68
bootstrap/miri: respect config_locked_deps
2 parents 9530589 + 28de139 commit b2e9d73

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/bootstrap/test.rs

+7
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,10 @@ impl Step for Miri {
630630
cargo.env("MIRI_SYSROOT", &miri_sysroot);
631631
cargo.env("MIRI_HOST_SYSROOT", sysroot);
632632
cargo.env("MIRI", &miri);
633+
if builder.config.locked_deps {
634+
// enforce lockfiles
635+
cargo.env("CARGO_EXTRA_FLAGS", "--locked");
636+
}
633637

634638
// Set the target.
635639
cargo.env("MIRI_TEST_TARGET", target.rustc_target_arg());
@@ -675,6 +679,9 @@ impl Step for Miri {
675679
);
676680
cargo.add_rustc_lib_path(builder, compiler);
677681
cargo.arg("--").arg("miri").arg("test");
682+
if builder.config.locked_deps {
683+
cargo.arg("--locked");
684+
}
678685
cargo
679686
.arg("--manifest-path")
680687
.arg(builder.src.join("src/tools/miri/test-cargo-miri/Cargo.toml"));

0 commit comments

Comments
 (0)