Skip to content

Commit ce6b261

Browse files
committed
tests: use --locked for all cargo calls
1 parent fe57c74 commit ce6b261

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/${BUILD_DIR}/cargo/build")
149149

150150
if(BUILD_TESTING)
151151
# Add CMake tests for `cargo test/clippy/fmt/doc`.
152-
add_test(NAME cargo_tests COMMAND cargo test --release --all-features --target-dir ${CARGO_TARGET_DIR})
153-
add_test(NAME cargo_doc COMMAND cargo doc --release --all-features --target-dir ${CARGO_TARGET_DIR})
152+
add_test(NAME cargo_tests COMMAND cargo test --locked --release --all-features --target-dir ${CARGO_TARGET_DIR})
153+
add_test(NAME cargo_doc COMMAND cargo doc --locked --release --all-features --target-dir ${CARGO_TARGET_DIR})
154154
# Minimum clippy version for the incompatible_msrv lint is 1.78.0
155-
add_test(NAME cargo_clippy COMMAND cargo +1.78.0 clippy --release --all-features --target-dir ${CARGO_TARGET_DIR} -- -D warnings)
155+
add_test(NAME cargo_clippy COMMAND cargo +1.78.0 clippy --locked --release --all-features --target-dir ${CARGO_TARGET_DIR} -- -D warnings)
156156

157157
set_tests_properties(cargo_tests cargo_clippy PROPERTIES
158158
ENVIRONMENT_MODIFICATION "${CARGO_ENV}"

scripts/check_cargo_build_rerun.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cd "$SOURCE_FOLDER"
1616
# Ensure that we do see a "Compiling" in the output
1717
# as if we do it means we have a cargo::rerun-if-changed incorrectly
1818
function check_build_contains_compiling() {
19-
BUILD=$(cargo build --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
19+
BUILD=$(cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
2020

2121
if ! echo "$BUILD" | grep -q Compiling; then
2222
echo "cargo build is missing text 'Compiling', likely an incorrect cargo::rerun-if-changed in a build script."
@@ -27,7 +27,7 @@ function check_build_contains_compiling() {
2727
# Ensure that we don't see any "Compiling" in the output
2828
# as if we do it means we have a cargo::rerun-if-changed incorrectly
2929
function check_build_no_compiling() {
30-
BUILD=$(cargo build --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
30+
BUILD=$(cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake 2>&1)
3131

3232
if echo "$BUILD" | grep -q Compiling; then
3333
echo "cargo build contained text 'Compiling', likely an incorrect cargo::rerun-if-changed in a build script."
@@ -36,7 +36,7 @@ function check_build_no_compiling() {
3636
}
3737

3838
# Build once
39-
cargo build --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake
39+
cargo build --locked --release --target-dir="$BUILD_FOLDER" -p qml-minimal-no-cmake
4040

4141
# Build a second time
4242
check_build_no_compiling

0 commit comments

Comments
 (0)