diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-12-17 15:24:03 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-01-03 07:05:39 -0500 |
| commit | fabb946090be2f604da3d7d4b1bbe93b79baf23e (patch) | |
| tree | c12d10a84953faa40622bdeafdfb9d6ec8058b47 /ci/test/00_setup_env_s390x.sh | |
| parent | faba4672b64fb5ba89e5cb6299479887494b571a (diff) | |
ci: Install needed gcc and qemu-user iff cross-compiling
Diffstat (limited to 'ci/test/00_setup_env_s390x.sh')
| -rw-r--r-- | ci/test/00_setup_env_s390x.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index a4f4841848..c049994944 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -10,7 +10,12 @@ 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. if [ -z ${QEMU_USER_CMD+x} ]; then export QEMU_USER_CMD="${QEMU_USER_CMD:-"qemu-s390x"}"; fi -export PACKAGES="python3-zmq bsdmainutils qemu-user" +export PACKAGES="python3-zmq" +if [ -n "$QEMU_USER_CMD" ]; then + # Likely cross-compiling, so install the needed gcc and qemu-user + export DPKG_ADD_ARCH="s390x" + export PACKAGES="$PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x libfontconfig1:s390x libxcb1:s390x" +fi export RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=true export GOAL="install" |