Skip to content

Commit 675a8a8

Browse files
MarcoFalkeUdjinM6
MarcoFalke
authored andcommitted
Merge bitcoin#17661: ci: use depends for s390x
e190000 ci-s390x: Add qemu and depends support in the ci script (Elichai Turkel) Pull request description: Related: bitcoin#17599 This adds qemu support just like we have in arm and compile the depends. other than that I also fixed some missing includes to make the depends compile. ACKs for top commit: MarcoFalke: ACK e190000 (first commit only, didn't look at second commit) Tree-SHA512: 2b8a39772b86408569f52cdc33832dbce7e5e9cdd710524295f3d259628cdfc017e740f6f94941307d7f8e413236814a95ba851153c617eb5fb75b4bd9a7e52f
1 parent 578fac1 commit 675a8a8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ after_success:
237237
arch: s390x
238238
env: >-
239239
FILE_ENV="./ci/test/00_setup_env_s390x.sh"
240+
QEMU_USER_CMD="" # Can run the tests natively without qemu
240241
241242
- stage: test
242243
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]'

ci/test/00_setup_env_s390x.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=s390x-unknown-linux-gnu
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"
11-
export NO_DEPENDS=1
9+
export HOST=s390x-linux-gnu
10+
# The host arch is unknown, so we run the tests through qemu.
11+
# If the host is s390x and wants to run the tests natively, it can set QEMU_USER_CMD to the empty string.
12+
export QEMU_USER_CMD="${QEMU_USER_CMD:"qemu-s390x"}"
13+
export PACKAGES="python3-zmq bsdmainutils qemu-user"
1214
export RUN_UNIT_TESTS=true
1315
export RUN_FUNCTIONAL_TESTS=true
1416
export GOAL="install"

0 commit comments

Comments
 (0)