From 7e3821c097c05a4790abac53ddd26ef28cb7cf4d Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 16 Sep 2014 13:25:46 -0400 Subject: [PATCH 1/3] travis: retry tests before giving up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7580adf5c4..82f3290110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,6 @@ script: - cd bitcoin-$HOST - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) - - if [ "$RUN_TESTS" = "true" ]; then make check; fi + - if [ "$RUN_TESTS" = "true" ]; then travis_retry make check; fi after_script: - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi From cf12c223d093d349822333582bd1899bdfb03bbc Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 16 Sep 2014 14:23:39 -0400 Subject: [PATCH 2/3] depends: respect CPPFLAGS when configuring with depends --- depends/config.site.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/config.site.in b/depends/config.site.in index 4012f5a8d1..1df04eec3f 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -52,7 +52,7 @@ export PATH=$prefix/native/bin:$PATH export PKG_CONFIG="`which pkg-config` --static" export PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig export PKG_CONFIG_PATH=$prefix/share/pkgconfig -export CPPFLAGS=-I$prefix/include/ +export CPPFLAGS="-I$prefix/include/ $CPPFLAGS" export CC="@CC@" export CXX="@CXX@" From 1b0c981cb69c63f09fef71241ded8a6279e4b993 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 16 Sep 2014 13:54:36 -0400 Subject: [PATCH 3/3] travis: use DEBUG_LOCKORDER for our quick/small Linux build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82f3290110..54799362a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - compiler: "true 1" env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" - compiler: "true 2" - env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_QT=1 NO_WALLET=1 NO_UPNP=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" + env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_QT=1 NO_WALLET=1 NO_UPNP=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat CPPFLAGS=-DDEBUG_LOCKORDER" - compiler: "true 3" env: HOST=x86_64-unknown-linux-gnu RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat" - compiler: "true 4"