diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-12-17 10:46:34 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-17 10:46:38 -0500 |
| commit | a54c16cdb6522b55cf25c1ef568a9a691c46fabb (patch) | |
| tree | 7a1bf4ad4113d596951e65e5112b36250c2f3f2d | |
| parent | 7df6a7ea98121997af2dcc57a69046ae252a9ec6 (diff) | |
| parent | e1900008699bd45031b7faa9ef3d0a81d54091b0 (diff) | |
| download | bitcoin-a54c16cdb6522b55cf25c1ef568a9a691c46fabb.tar.xz | |
Merge #17661: ci: use depends for s390x
e1900008699bd45031b7faa9ef3d0a81d54091b0 ci-s390x: Add qemu and depends support in the ci script (Elichai Turkel)
Pull request description:
Related: #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
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | ci/test/00_setup_env_s390x.sh | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 4f9dbeded4..8a7b41f5ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,6 +93,7 @@ jobs: arch: s390x env: >- FILE_ENV="./ci/test/00_setup_env_s390x.sh" + QEMU_USER_CMD="" # Can run the tests natively without qemu - stage: test name: 'Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]' diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index 89660c7fa4..637d549553 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -6,9 +6,11 @@ export LC_ALL=C.UTF-8 -export HOST=s390x-unknown-linux-gnu -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 HOST=s390x-linux-gnu +# The host arch is unknown, so we run the tests through qemu. +# If the host is s390x and wants to run the tests natively, it can set QEMU_USER_CMD to the empty string. +export QEMU_USER_CMD="${QEMU_USER_CMD:"qemu-s390x"}" +export PACKAGES="python3-zmq bsdmainutils qemu-user" export RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=true export GOAL="install" |