diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ci/test/00_setup_env_s390x.sh | 7 | ||||
| -rwxr-xr-x | ci/test/04_install.sh | 2 | ||||
| -rwxr-xr-x | test/functional/interface_rest.py | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 6612d5e4d1..1c19145166 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,14 +96,14 @@ jobs: - set -o errexit; source ./ci/extended_lint/06_script.sh - stage: test - name: 'ARM [GOAL: install] [unit tests, functional tests]' + name: 'ARM [GOAL: install] [bionic] [unit tests, functional tests]' arch: arm64 env: >- FILE_ENV="./ci/test/00_setup_env_arm.sh" QEMU_USER_CMD="" # Can run the tests natively without qemu - stage: test - name: 'S390x [GOAL: install] [unit tests, functional tests]' + name: 'S390x [GOAL: install] [bionic] [unit tests, functional tests]' arch: s390x env: >- FILE_ENV="./ci/test/00_setup_env_s390x.sh" diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index b41d44c61a..89660c7fa4 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -7,12 +7,9 @@ export LC_ALL=C.UTF-8 export HOST=s390x-unknown-linux-gnu -export DOCKER_NAME_TAG=s390x/ubuntu:18.04 -export PACKAGES="clang llvm 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 libqrencode-dev" +export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools 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 libqrencode-dev" export NO_DEPENDS=1 export RUN_UNIT_TESTS=true -export RUN_FUNCTIONAL_TESTS=false +export RUN_FUNCTIONAL_TESTS=true export GOAL="install" export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb" - -lscpu diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index ce41c37b6e..5055a72096 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -72,6 +72,8 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then else DOCKER_EXEC free -m -h DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\) + DOCKER_EXEC echo "Free disk space:" + DOCKER_EXEC df -h fi if [ -n "$DPKG_ADD_ARCH" ]; then diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py index a036dfc790..797fcc828a 100755 --- a/test/functional/interface_rest.py +++ b/test/functional/interface_rest.py @@ -151,7 +151,7 @@ class RESTTest (BitcoinTestFramework): bin_response = self.test_rest_request("/getutxos", http_method='POST', req_type=ReqType.BIN, body=bin_request, ret_type=RetType.BYTES) output = BytesIO(bin_response) - chain_height, = unpack("i", output.read(4)) + chain_height, = unpack("<i", output.read(4)) response_hash = output.read(32)[::-1].hex() assert_equal(bb_hash, response_hash) # check if getutxo's chaintip during calculation was fine |