From fa94fc10c881e502e6c9a71f3b7719aa955900f9 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 25 Nov 2019 15:08:37 -0500
Subject: [PATCH 1/3] ci: Run functional tests on s390x

---
 .travis.yml                   | 4 ++--
 ci/test/00_setup_env_s390x.sh | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6612d5e4d..1c1914516 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 b41d44c61..89660c7fa 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

From fad9fdbea5dfb19328282afda9588edc6f1d0ddf Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 25 Nov 2019 15:30:01 -0500
Subject: [PATCH 2/3] test: Properly deserialize integers in little-endian

---
 test/functional/interface_rest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py
index a036dfc79..797fcc828 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

From fabd71076cd9493bd2d30a198467f5ea621b27aa Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 25 Nov 2019 16:27:05 -0500
Subject: [PATCH 3/3] ci: Print free disk space

---
 ci/test/04_install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index ce41c37b6..5055a7209 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