From bf9fedc4ee2eaa4dcbc6fcb9ef73bdf6967ee071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 27 Dec 2018 11:42:19 +0100 Subject: [PATCH] Revert "Add --frozen when running cargo (#10081)" (#10105) * Revert "Add --frozen when running cargo (#10081)" This reverts commit c90e279ab5c76787dccb8da35b90aacab33aca6e. * Add Cargo.lock modification detection. --- test.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test.sh b/test.sh index 074171bfe..762f20972 100755 --- a/test.sh +++ b/test.sh @@ -35,9 +35,16 @@ validate () { if [ "$VALIDATE" -eq "1" ] then echo "________Validate build________" - time cargo check $@ --frozen --no-default-features - time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --no-default-features - time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --features "mio" + time cargo check $@ --no-default-features + time cargo check $@ --manifest-path util/io/Cargo.toml --no-default-features + time cargo check $@ --manifest-path util/io/Cargo.toml --features "mio" + + MODIFIED=$(git ls-files -m | grep Cargo.lock | wc -l) + if [ "$MODIFIED" -eq "1" ] + then + echo "Detected Cargo.lock modification. Exitting." + exit 1 + fi # Validate chainspecs echo "________Validate chainspecs________" @@ -71,7 +78,7 @@ cpp_test () { cargo_test () { echo "________Running Parity Full Test Suite________" git submodule update --init --recursive - time cargo test $OPTIONS --features "$FEATURES" --frozen --all $@ -- --test-threads $THREADS + time cargo test $OPTIONS --features "$FEATURES" --all $@ -- --test-threads $THREADS }