diff --git a/.travis.yml b/.travis.yml index 67c09e5556..994c7756c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -201,6 +201,7 @@ jobs: # x86_64 Linux w/ Bitcoin functional tests (Qt5 & system libs) - stage: test + name: 'x86_64 Linux [GOAL: install] [bitcoin functional]' env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" @@ -213,6 +214,7 @@ jobs: # x86_64 Linux w/ single fedpeg test that uses upstream bitcoind as mainchain - stage: test + name: 'x86_64 Linux [GOAL: install] [bitcoind fedpeg test]' env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" @@ -225,6 +227,7 @@ jobs: BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=no --disable-tests --disable-bench CPPFLAGS=-DDEBUG_LOCKORDER" # x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout), no functional tests, LIQUID BUILD - stage: test + name: 'x86_64 Linux [GOAL: install] [liquid build]' env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index 88444bebf4..01319eba23 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -43,36 +43,4 @@ BEGIN_FOLD build DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ) END_FOLD -if [ "$RUN_UNIT_TESTS" = "true" ]; then - BEGIN_FOLD unit-tests - DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1 - END_FOLD -fi - -if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then - extended="--extended --exclude feature_pruning" -fi - -if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then - BEGIN_FOLD functional-tests - DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast ${extended} - END_FOLD -fi - -if [ "$RUN_BITCOIN_TESTS" = "true" ]; then - BEGIN_FOLD bitcoin-functional-tests - DOCKER_EXEC test/bitcoin_functional/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended} - END_FOLD -fi - -if [ "$RUN_FEDPEG_BITCOIND_TEST" = "true" ]; then - BEGIN_FOLD fedpeg-bitcoind-test - BITCOIND_VERSION=0.18.0 - BITCOIND_ARCH=x86_64-linux-gnu - DOCKER_EXEC curl -O https://bitcoincore.org/bin/bitcoin-core-$BITCOIND_VERSION/bitcoin-$BITCOIND_VERSION-$BITCOIND_ARCH.tar.gz - DOCKER_EXEC tar -zxf bitcoin-$BITCOIND_VERSION-$BITCOIND_ARCH.tar.gz - DOCKER_EXEC test/functional/feature_fedpeg.py --parent_bitcoin --parent_binpath $(pwd)/bitcoin-$BITCOIND_VERSION/bin/bitcoind - END_FOLD -fi - -cd ${BASE_BUILD_DIR} || (echo "could not enter travis build dir $BASE_BUILD_DIR"; exit 1) +cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)