diff options
| author | Elichai Turkel <[email protected]> | 2019-11-28 13:26:48 +0200 |
|---|---|---|
| committer | Elichai Turkel <[email protected]> | 2019-12-14 18:27:13 +0200 |
| commit | e1900008699bd45031b7faa9ef3d0a81d54091b0 (patch) | |
| tree | 6bb7b023c3f90b316fa5c56c17b7600bae1ecdfb | |
| parent | Merge #17511: Add bounds checks before base58 decoding (diff) | |
| download | discoin-e1900008699bd45031b7faa9ef3d0a81d54091b0.tar.xz discoin-e1900008699bd45031b7faa9ef3d0a81d54091b0.zip | |
ci-s390x: Add qemu and depends support in the ci script
| -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 4f9dbeded..8a7b41f5c 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 89660c7fa..637d54955 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" |