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

bootstrap/miri: respect config_locked_deps

Browse Source
This commit is contained in:
Ralf Jung 2023-08-22 08:48:39 +02:00
parent 32aa40538e
commit 28de139d35
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/test.rs
View File

@ -630,6 +630,10 @@ impl Step for Miri {
cargo.env("MIRI_SYSROOT", &miri_sysroot); cargo.env("MIRI_SYSROOT", &miri_sysroot);
cargo.env("MIRI_HOST_SYSROOT", sysroot); cargo.env("MIRI_HOST_SYSROOT", sysroot);
cargo.env("MIRI", &miri); cargo.env("MIRI", &miri);
if builder.config.locked_deps {
// enforce lockfiles
cargo.env("CARGO_EXTRA_FLAGS", "--locked");
}
// Set the target. // Set the target.
cargo.env("MIRI_TEST_TARGET", target.rustc_target_arg()); 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.add_rustc_lib_path(builder, compiler);
cargo.arg("--").arg("miri").arg("test"); cargo.arg("--").arg("miri").arg("test");
if builder.config.locked_deps {
cargo.arg("--locked");
}
cargo cargo
.arg("--manifest-path") .arg("--manifest-path")
.arg(builder.src.join("src/tools/miri/test-cargo-miri/Cargo.toml")); .arg(builder.src.join("src/tools/miri/test-cargo-miri/Cargo.toml"));