Skip to content

Commit 69ca6cd

Browse files
author
MarcoFalke
committed
Merge #17599: ci: Run functional tests on s390x
fabd710 ci: Print free disk space (MarcoFalke) fad9fdb test: Properly deserialize integers in little-endian (MarcoFalke) fa94fc1 ci: Run functional tests on s390x (MarcoFalke) Pull request description: Top commit has no ACKs. Tree-SHA512: 98ba77eb56f283131fdaeb393fda86cc308f1bf9781e1e0e5736b8d616528dc8ff2e494d55ba107c138083025c66a59e382fcfa9962d4349a5fd6cbbc52484c3
2 parents 2b6575d + fabd710 commit 69ca6cd

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ jobs:
9696
- set -o errexit; source ./ci/extended_lint/06_script.sh
9797

9898
- stage: test
99-
name: 'ARM [GOAL: install] [unit tests, functional tests]'
99+
name: 'ARM [GOAL: install] [bionic] [unit tests, functional tests]'
100100
arch: arm64
101101
env: >-
102102
FILE_ENV="./ci/test/00_setup_env_arm.sh"
103103
QEMU_USER_CMD="" # Can run the tests natively without qemu
104104
105105
- stage: test
106-
name: 'S390x [GOAL: install] [unit tests, functional tests]'
106+
name: 'S390x [GOAL: install] [bionic] [unit tests, functional tests]'
107107
arch: s390x
108108
env: >-
109109
FILE_ENV="./ci/test/00_setup_env_s390x.sh"

ci/test/00_setup_env_s390x.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
export LC_ALL=C.UTF-8
88

99
export HOST=s390x-unknown-linux-gnu
10-
export DOCKER_NAME_TAG=s390x/ubuntu:18.04
11-
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"
10+
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"
1211
export NO_DEPENDS=1
1312
export RUN_UNIT_TESTS=true
14-
export RUN_FUNCTIONAL_TESTS=false
13+
export RUN_FUNCTIONAL_TESTS=true
1514
export GOAL="install"
1615
export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb"
17-
18-
lscpu

ci/test/04_install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
7272
else
7373
DOCKER_EXEC free -m -h
7474
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
75+
DOCKER_EXEC echo "Free disk space:"
76+
DOCKER_EXEC df -h
7577
fi
7678

7779
if [ -n "$DPKG_ADD_ARCH" ]; then

test/functional/interface_rest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def run_test(self):
151151

152152
bin_response = self.test_rest_request("/getutxos", http_method='POST', req_type=ReqType.BIN, body=bin_request, ret_type=RetType.BYTES)
153153
output = BytesIO(bin_response)
154-
chain_height, = unpack("i", output.read(4))
154+
chain_height, = unpack("<i", output.read(4))
155155
response_hash = output.read(32)[::-1].hex()
156156

157157
assert_equal(bb_hash, response_hash) # check if getutxo's chaintip during calculation was fine

0 commit comments

Comments
 (0)