diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-09-16 15:25:00 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-09-16 15:25:00 -0400 |
| commit | d65ea7efa320cc75d863918fe163831ff2b6d4df (patch) | |
| tree | 396fddfb58da63fbef535ec9e1b1f46258618a13 | |
| parent | ab3834baae2e48708de2be74217eaf9da9081fc3 (diff) | |
| parent | 1b0c981cb69c63f09fef71241ded8a6279e4b993 (diff) | |
Merge pull request #4932 from theuni/travis
Travis tweaks
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | depends/config.site.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 7580adf5c4..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" @@ -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 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@" |