From 09feb1460522fa6c0a780ea0373c6828faf40286 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 14 Feb 2019 11:27:42 -0500 Subject: [PATCH 1/2] Disable unit tests for 32-bit builds to avoid Travis 10 min timeout --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0b93a31f19..63804f0dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ jobs: PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32" GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports" + RUN_UNIT_TESTS=false # secp-zkp times out Travis, get 32-bit build in upstream? # Win64 - stage: test env: >- @@ -91,6 +92,7 @@ jobs: GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" CONFIG_SHELL="/bin/dash" + RUN_UNIT_TESTS=false # secp-zkp times out Travis, get 32-bit build in upstream? # x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout) - stage: test env: >- From c84c95bcd946c4911fead78313457b97b0331b8d Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 21 Mar 2019 07:06:39 -0400 Subject: [PATCH 2/2] Split up DEBUG build into functional and unit runs --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63804f0dac..ffd1ad1dea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,7 @@ jobs: BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" CONFIG_SHELL="/bin/dash" RUN_UNIT_TESTS=false # secp-zkp times out Travis, get 32-bit build in upstream? -# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout) +# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout), no functional tests - stage: test env: >- HOST=x86_64-unknown-linux-gnu @@ -101,6 +101,16 @@ jobs: DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CXXFLAGS=\"-g0 -O2\"" + RUN_FUNCTIONAL_TESTS=false +# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout), no unit tests + - stage: test + env: >- + HOST=x86_64-unknown-linux-gnu + PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" + DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" + GOAL="install" + BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CXXFLAGS=\"-g0 -O2\"" + RUN_UNIT_TESTS=false # x86_64 Linux (no depends, only system libs) - stage: test env: >-