From d71ddbee40ecb3bae52b449c3f6a6f35c645e24e Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Wed, 9 Oct 2019 17:16:04 -0400
Subject: [PATCH] Don't run normal functional tests twice.

---
 .travis.yml                 |  3 +++
 .travis/test_06_script_a.sh | 32 --------------------------------
 .travis/test_06_script_b.sh | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb547ccb8b..7d4dec74db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,6 +190,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"
@@ -202,6 +203,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"
@@ -214,6 +216,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/.travis/test_06_script_a.sh b/.travis/test_06_script_a.sh
index dfd916bb73..7282edf93c 100755
--- a/.travis/test_06_script_a.sh
+++ b/.travis/test_06_script_a.sh
@@ -47,36 +47,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 ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)
diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh
index 268d6fde9e..98ce0d5ce0 100755
--- a/.travis/test_06_script_b.sh
+++ b/.travis/test_06_script_b.sh
@@ -25,3 +25,29 @@ if [ "$RUN_FUZZ_TESTS" = "true" ]; then
   DOCKER_EXEC test/fuzz/test_runner.py -l DEBUG ${DIR_FUZZ_IN}
   END_FOLD
 fi
+
+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 [ "$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
+
+if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
+  extended="--extended --exclude feature_pruning"
+fi