Skip to content

Commit 22a6031

Browse files
committed
Merge dashpay#690: Add valgrind check to travis
dd98cc9 travis: Added a valgrind test without endro and enabled recovery+ecdh (Elichai Turkel) b4c1382 Add valgrind check to travis (Elichai Turkel) Pull request description: As discussed in bitcoin-core/secp256k1#687 This adds valgrind check to the repo. It doesn't run on recovery+ecdh because of the time. No openssl because of uninitialized mem. I debated between with and without ASM, but decided with ASM because it might be more fragile(?). I wasn't sure if I should pass `-DVALGRIND` via `CFLAGS` or `CPPFLAGS`, it seems like because this is only C then there shouldn't even be `CPPFLAGS` but looks like we use `CPPFLAGS` in other places for the preprocessor definitions. If people are worried about the time it takes we can mark it as `allow_failure` although I don't think it's a problem here because there's only a handful of PRs and they're usually open for weeks. ACKs for top commit: real-or-random: ACK dd98cc9 I looked at the diff jonasnick: ACK dd98cc9 Tree-SHA512: 72d7f1f4c8dd4c58501ac1003b28296d6fd140a8f7711e9e3b3c04a3fbce358ff1c89d2e1d1c5489d7668d3019981264c5cadecae3d9b48cd38c9463e287d8ad
2 parents 544002c + dd98cc9 commit 22a6031

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

.travis.yml

+27-1
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,36 @@ matrix:
6161
packages:
6262
- gcc-multilib
6363
- libgmp-dev:i386
64+
- compiler: gcc
65+
env:
66+
- BIGNUM=no ENDOMORPHISM=yes ASM=x86_64 EXPERIMENTAL=yes ECDH=yes RECOVERY=yes
67+
- VALGRIND=yes EXTRAFLAGS="--disable-openssl-tests CPPFLAGS=-DVALGRIND" BUILD=
68+
addons:
69+
apt:
70+
packages:
71+
- valgrind
72+
- compiler: gcc
73+
env: # The same as above but without endomorphism.
74+
- BIGNUM=no ENDOMORPHISM=no ASM=x86_64 EXPERIMENTAL=yes ECDH=yes RECOVERY=yes
75+
- VALGRIND=yes EXTRAFLAGS="--disable-openssl-tests CPPFLAGS=-DVALGRIND" BUILD=
76+
addons:
77+
apt:
78+
packages:
79+
- valgrind
80+
6481
before_install: mkdir -p `dirname $GUAVA_JAR`
6582
install: if [ ! -f $GUAVA_JAR ]; then wget $GUAVA_URL -O $GUAVA_JAR; fi
6683
before_script: ./autogen.sh
84+
6785
script:
6886
- if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi
6987
- if [ "x$HOST" = "xi686-linux-gnu" ]; then export CC="$CC -m32"; fi
70-
- ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-asm=$ASM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --with-ecmult-gen-precision=$ECMULTGENPRECISION --enable-module-ecdh=$ECDH --enable-module-recovery=$RECOVERY --enable-jni=$JNI $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
88+
- ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-asm=$ASM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --with-ecmult-gen-precision=$ECMULTGENPRECISION --enable-module-ecdh=$ECDH --enable-module-recovery=$RECOVERY --enable-jni=$JNI $EXTRAFLAGS $USE_HOST
89+
- if [ -n "$BUILD" ]; then make -j2 $BUILD; fi
90+
- # travis_wait extends the 10 minutes without output allowed (https://docs.travis-ci.com/user/common-build-problems/#build-times-out-because-no-output-was-received)
91+
- # the `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (http://valgrind.org/docs/manual/manual-core.html)
92+
- if [ -n "$VALGRIND" ]; then
93+
make -j2 &&
94+
travis_wait 30 valgrind --error-exitcode=42 ./tests 16 &&
95+
travis_wait 30 valgrind --error-exitcode=42 ./exhaustive_tests;
96+
fi

0 commit comments

Comments
 (0)