grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add --frozen when running cargo (#10081)" (#10105) 

* Revert "Add --frozen when running cargo (#10081)"

This reverts commit c90e279ab5.

* Add Cargo.lock modification detection.
This commit is contained in:
Tomasz Drwięga 2018-12-27 11:42:19 +01:00 committed by Andronik Ordian
parent 78ba54da6b
commit bf9fedc4ee
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test.sh
View File

@ -35,9 +35,16 @@ validate () {
if [ "$VALIDATE" -eq "1" ] if [ "$VALIDATE" -eq "1" ]
then then
echo "________Validate build________" echo "________Validate build________"
time cargo check $@ --frozen --no-default-features time cargo check $@ --no-default-features
time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --no-default-features time cargo check $@ --manifest-path util/io/Cargo.toml --no-default-features
time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --features "mio" 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 # Validate chainspecs
echo "________Validate chainspecs________" echo "________Validate chainspecs________"
@ -71,7 +78,7 @@ cpp_test () {
cargo_test () { cargo_test () {
echo "________Running Parity Full Test Suite________" echo "________Running Parity Full Test Suite________"
git submodule update --init --recursive 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
} }