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_arm.sh | |
| parent | faba4672b64fb5ba89e5cb6299479887494b571a (diff) | |
ci: Install needed gcc and qemu-user iff cross-compiling
Diffstat (limited to 'ci/test/00_setup_env_arm.sh')
| -rw-r--r-- | ci/test/00_setup_env_arm.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 4047f8ed8d..b98b39a83a 100644 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -10,10 +10,12 @@ export HOST=arm-linux-gnueabihf # The host arch is unknown, so we run the tests through qemu. # If the host is arm 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-arm -L /usr/arm-linux-gnueabihf/"}"; fi -# We don't know whether the host can run the cross compiled binaries. To run them, either qemu-user or libc6:armhf for -# the target is required, so install both. export DPKG_ADD_ARCH="armhf" -export PACKAGES="python3 g++-arm-linux-gnueabihf busybox qemu-user libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf" +export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf" +if [ -n "$QEMU_USER_CMD" ]; then + # Likely cross-compiling, so install the needed gcc and qemu-user + export PACKAGES="$PACKAGES qemu-user" +fi export USE_BUSY_BOX=true export RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=true |