Merge pull request #171 from project-ecc/dev

Merge version 0.2.5.15 from dev
project-ecc · May 3, 2019 · 06804e7 · 06804e7
2 parents 4489c58 + d201d01
commit 06804e7
Show file tree

Hide file tree

Showing 223 changed files with 6,556 additions and 6,859 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ src/test/buildenv.py
 *.tar.gz
 
 *.exe
+src/eccoind
 src/bitcoin
 src/bitcoind
 src/bitcoin-cli

diff --git a/.travis.yml b/.travis.yml
@@ -1,145 +1,127 @@
 sudo: required
-dist: trusty
+dist: xenial
 os: linux
-language: generic
+language: minimal
 cache:
+  ccache: true
   directories:
   - depends/built
   - depends/sdk-sources
   - $HOME/.ccache
 
 env:
   global:
-    - MAKEJOBS=-j3
+    - MAKEJOBS=-j2
     - RUN_TESTS=false
     - RUN_FORMATTING_CHECK=false
+    - DOCKER_NAME_TAG=ubuntu:18.04
     - CHECK_DOC=0
     - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
     - CCACHE_SIZE=100M
     - CCACHE_TEMPDIR=/tmp/.ccache-temp
     - CCACHE_COMPRESS=1
+    - CCACHE_DIR=$HOME/.ccache
     - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
     - USE_CLANG=false
     - SDK_URL=https://www.bitcoinunlimited.info/sdks
+    - LINTER_DEB_URL=https://www.bitcoinunlimited.info/depends-sources/
     - PYTHON_DEBUG=1
     - WINEDEBUG=fixme-all
-    - PPA=ppa:bitcoin-unlimited/bu-ppa
-    - PPA2=ppa:sickpig/boost
+    - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache python3"
+    - LC_ALL=C.UTF-8
 
 matrix:
   include:
-    #bitcoind clang
     - compiler: clang
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-5.0
-          packages:
-            - clang-5.0
       env:
         - USE_CLANG=true
         - CXX=clang++-5.0 CC=clang-5.0
-        - CXXFLAGS="-std=c++11"
+        - CXXFLAGS="-std=c++14"
         - HOST=x86_64-unknown-linux-gnu
         - RUN_TESTS=false
-        - PACKAGES="python3-zmq libzmq3-dev clang-format-3.8 build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils libboost-all-dev qtbase5-dev protobuf-compiler qttools5-dev-tools qttools5-dev"
-        - GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 CC=clang-5.0 CXX=clang++-5.0 CPPFLAGS=-DDEBUG_LOCKORDER"
+        - PACKAGES="python3-zmq libzmq3-dev qttools5-dev-tools qttools5-dev clang-5.0 libssl1.0-dev libevent-dev bsdmainutils libboost-all-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev"
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-zmq CC=clang-5.0 --with-incompatible-bdb CXX=clang++-5.0 CPPFLAGS=-DDEBUG_LOCKORDER"
     #bitcoind
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq clang-format-3.8" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true RUN_FORMATTING_CHECK=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
+        - HOST=x86_64-unknown-linux-gnu
+        - PACKAGES="libedit2 python python3-zmq"
+        - DEP_OPTS="NO_UPNP=1 DEBUG=1"
+        - RUN_TESTS=true
+        - RUN_FORMATTING_CHECK=true
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
     #ARM64
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=aarch64-linux-gnu PACKAGES="g++-aarch64-linux-gnu" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+        - HOST=aarch64-linux-gnu
+        - PACKAGES="g++-aarch64-linux-gnu"
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi"
     #ARM32
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+        - HOST=arm-linux-gnueabihf
+        - PACKAGES="g++-arm-linux-gnueabihf"
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     #Win32
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
+        - HOST=i686-w64-mingw32
+        - DPKG_ADD_ARCH="i386"
+        - PACKAGES="python3 nsis g++-mingw-w64-i686 wine32 wine-binfmt"
+        - RUN_TESTS=true
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-reduce-exports"
     #Linux32-bit + dash
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
+        - HOST=i686-pc-linux-gnu
+        - PACKAGES="g++-multilib bc python3-zmq"
+        - RUN_TESTS=true
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
+        - USE_SHELL="/bin/dash"
     #Win64
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
-    #x86_64 Linux, No wallet (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout)
+        - HOST=x86_64-w64-mingw32
+        - DPKG_ADD_ARCH="i386"
+        - PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine64 wine-binfmt"
+        - RUN_TESTS=true
+        - GOAL="install"
+        - BITCOIN_CONFIG="--enable-reduce-exports"
     - compiler: gcc
       env:
         - CXX=g++ CC=gcc
-        - HOST=x86_64-unknown-linux-gnu PACKAGES="python3 qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="NO_WALLET=1 NO_QT=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+        - HOST=x86_64-unknown-linux-gnu PACKAGES="python3 python3-zmq libzmq3-dev qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
     #Cross-Mac
     - compiler: gcc
       env:
-        - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev clang-3.8 libc++-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
+        - HOST=x86_64-apple-darwin11
+        - PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git"
+        - BITCOIN_CONFIG="--enable-reduce-exports"
+        - OSX_SDK=10.11
+        - GOAL="deploy"
 
 before_install:
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
-    #  temp fix with riak repo, by the way we don't need riak at all
-    - sudo rm -vf /etc/apt/sources.list.d/*riak*
-    - sudo apt-get update
-
+    - set -o errexit; source .travis/before_install.sh
 install:
-    - if [ -n "$PPA" ]; then for i in `seq 0 4`; do sudo add-apt-repository "$PPA" -y 2>&1|tee /dev/stderr|grep -q "imported" && break; sleep 30; done; fi
-    - if [ -n "$PPA2" ]; then for i in `seq 0 4`; do sudo add-apt-repository "$PPA2" -y 2>&1|tee /dev/stderr|grep -q "imported" && break; sleep 30; done; fi
-    - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq libdb4.8-dev libdb4.8++-dev $PACKAGES; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install -y -qq libboost1.58-dev ; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install -y -qq libboost1.58-tools-dev libboost-system1.58-dev libboost-filesystem1.58-dev libboost-program-options1.58-dev libboost-thread1.58-dev libboost-test1.58-dev; fi
-
+    - set -o errexit; source .travis/install.sh
 before_script:
-    - unset CC; unset CXX
-    - if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi
-    - mkdir -p depends/SDKs depends/sdk-sources
-    - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - echo "USE_CLANG=$USE_CLANG"
-    - if [ "$USE_CLANG" = "false" ]; then make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi
+    - set -o errexit; source .travis/before_script.sh
 script:
-    - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
-    - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
-    - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
-    - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib";
-    - if [ "$USE_CLANG" = "false" ]; then depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE; fi
-    - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh 2>&1 > autogen.out"' || ./autogen.sh 2>&1 > autogen.out || ( cat autogen.out && false)
-    - mkdir build && cd build
-    - echo "BITCOIN_CONFIG_ALL=$BITCOIN_CONFIG_ALL"
-    - echo "BITCOIN_CONFIG=$BITCOIN_CONFIG"
-    - echo "GOAL=$GOAL"
-    - ../configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG 2>&1 > configure.out || ( cat configure.out && cat config.log && false)
-    - if [ "$USE_CLANG" = "true" ]; then
-         cat configure.out;
-         head config.log;
-      fi
-    - if [ "$RUN_FORMATTING_CHECK" = "true" ]; then make $MAKEJOBS check-formatting VERBOSE=1; fi
-    - if [ "$USE_CLANG" = "false" ]; then
-        stdbuf -i0 -o0 -e0 make $MAKEJOBS $GOAL 2>&1 | ../contrib/devtools/buildsilence.py || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) ;
-      else
-         CXXFLAGS="-std=c++11 -Werror" make $MAKEJOBS $GOAL;
-      fi
-    - if [ "USE_CLANG" = "false" ]; then export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib; fi
-    - if [ "$RUN_TESTS" = "true" ] && { [ "$HOST" = "i686-w64-mingw32" ] || [ "$HOST" = "x86_64-w64-mingw32" ]; }; then travis_wait make $MAKEJOBS check VERBOSE=1; fi
-    - if [ "$RUN_TESTS" = "true" ] && ! { [ "$HOST" = "i686-w64-mingw32" ] || [ "$HOST" = "x86_64-w64-mingw32" ]; }; then make $MAKEJOBS check VERBOSE=1; fi
-    - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage --no-ipv6-rpc-listen; fi
+    - if [ $SECONDS -gt 1980 ]; then set +o errexit; echo "Travis early exit to cache current state"; false; else set -o errexit; source .travis/script_a.sh; fi
+    - if [ $SECONDS -gt 1980 ]; then set +o errexit; echo "Travis early exit to cache current state"; false; else set -o errexit; source .travis/script_b.sh; fi
 after_script:
-    - echo $TRAVIS_COMMIT_RANGE
-    - echo $TRAVIS_COMMIT_LOG
-
+    - set -o errexit; cd $TRAVIS_BUILD_DIR; source .travis/after_script.sh
 after_failure:
-    - for i in `find /home/travis/ -name debug.log`; do echo $i; echo "-----"; cat $i; done
-    - for i in `find /tmp/ -name debug.log`; do echo $i; echo "-----"; cat $i; done
-    - for i in `find /home/travis/ -name bitcoin.conf`; do echo $i; echo "-----"; cat $i; done
-    - for i in `find /tmp/ -name bitcoin.conf`; do echo $i; echo "-----"; cat $i; done
-
+    - set -o errexit; cd $TRAVIS_BUILD_DIR; source .travis/after_failure.sh
diff --git a/.travis/after_failure.sh b/.travis/after_failure.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+for i in `find /home/travis/ -name debug.log`; do echo $i; echo "-----"; cat $i; done
+for i in `find /tmp/ -name debug.log`; do echo $i; echo "-----"; cat $i; done
+for i in `find /home/travis/ -name bitcoin.conf`; do echo $i; echo "-----"; cat $i; done
+for i in `find /tmp/ -name bitcoin.conf`; do echo $i; echo "-----"; cat $i; done
diff --git a/.travis/after_script.sh b/.travis/after_script.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+echo $TRAVIS_COMMIT_RANGE
+echo $TRAVIS_COMMIT_LOG
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
+export PATH
+
+BEGIN_FOLD () {
+  echo ""
+  CURRENT_FOLD_NAME=$1
+  echo "travis_fold:start:${CURRENT_FOLD_NAME}"
+}
+
+END_FOLD () {
+  RET=$?
+  echo "travis_fold:end:${CURRENT_FOLD_NAME}"
+  if [ $RET != 0 ]; then
+    echo "${CURRENT_FOLD_NAME} failed with status code ${RET}"
+  fi
+}
diff --git a/.travis/before_script.sh b/.travis/before_script.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+unset CC; unset CXX
+if [ "$CHECK_DOC" = 1 ]; then DOCKER_EXEC contrib/devtools/check-doc.py; fi
+mkdir -p depends/SDKs depends/sdk-sources
+if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
+if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
+if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi
+if [ -z "$NODEPENDS" ]; then
+  DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS;
+fi
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+travis_retry docker pull "$DOCKER_NAME_TAG"
+env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
+if [[ $HOST = *-mingw32 ]]; then
+  DOCKER_ADMIN="--cap-add SYS_ADMIN";
+fi
+DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)
+DOCKER_EXEC () {
+  docker exec $DOCKER_ID bash -c "cd $PWD && $*";
+}
+if [ -n "$DPKG_ADD_ARCH" ]; then
+  DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH";
+fi
+travis_retry DOCKER_EXEC apt-get update
+travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES
+if [ $RUN_FORMATTING_CHECK = "true" ]; then
+  curl --location $LINTER_DEB_URL/libllvm3.8_3.8.1-27ubuntu1_amd64.deb -o llvm-3.8.deb;
+  curl --location $LINTER_DEB_URL/clang-format-3.8_3.8.1-27ubuntu1_amd64.deb -o clang-format-3.8.deb;
+  DOCKER_EXEC dpkg -i llvm-3.8.deb clang-format-3.8.deb;
+fi
diff --git a/.travis/script_a.sh b/.travis/script_a.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+
+BEGIN_FOLD autogen
+export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
+if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
+OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
+BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib";
+if [ -z "$NODEPENDS" ]; then
+  DOCKER_EXEC ccache --max-size=$CCACHE_SIZE;
+fi
+test -n "$USE_SHELL" && DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh 2>&1 > autogen.out" || ./autogen.sh 2>&1 > autogen.out || (cat autogen.out && false)
+END_FOLD
+
+mkdir build && cd build
+echo "BITCOIN_CONFIG_ALL=$BITCOIN_CONFIG_ALL"
+echo "BITCOIN_CONFIG=$BITCOIN_CONFIG"
+echo "GOAL=$GOAL"
+
+BEGIN_FOLD configure
+DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+END_FOLD
+
+BEGIN_FOLD formatting-check
+if [ "$RUN_FORMATTING_CHECK" = "true" ]; then DOCKER_EXEC make $MAKEJOBS check-formatting VERBOSE=1; fi
+END_FOLD
+
+BEGIN_FOLD make
+DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ) ;
+if [ "$RUN_TESTS" = "true" ] && { [ "$HOST" = "i686-w64-mingw32" ] || [ "$HOST" = "x86_64-w64-mingw32" ]; }; then
+  travis_wait 50 DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1;
+fi
+END_FOLD
+
+cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)
diff --git a/.travis/script_b.sh b/.travis/script_b.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The BitcoinUnlimited developers
+# Copyright (c) 2019 The Eccoin developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+cd "build" || (echo "could not enter distdir build"; exit 1)
+
+BEGIN_FOLD unit-tests
+if [ "$RUN_TESTS" = "true" ] && ! { [ "$HOST" = "i686-w64-mingw32" ] || [ "$HOST" = "x86_64-w64-mingw32" ]; }; then
+  DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1;
+fi
+END_FOLD
+
+BEGIN_FOLD functional-tests
+if [ "$RUN_TESTS" = "true" ]; then DOCKER_EXEC qa/pull-tester/rpc-tests.py --coverage --no-ipv6-rpc-listen; fi
+END_FOLD