diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-12-17 14:16:48 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-01-03 07:04:45 -0500 |
commit | faba4672b64fb5ba89e5cb6299479887494b571a (patch) | |
tree | d4070d7b946f7684548dc4b0452700cec5df5d05 /ci/test/00_setup_env_arm.sh | |
parent | fa5d709fb266c97d4db15006bf855e887a6c123b (diff) | |
download | bitcoin-faba4672b64fb5ba89e5cb6299479887494b571a.tar.xz |
ci: Fix QEMU_USER_CMD parse issues
* Fix bash syntax by adding missing -
* Disable QEMU_USER_CMD fallback when it is set
Apparently bash can't distinguish an unset variable from a variable
that is set to the empty string
* Export the environment variable to the docker env, otherwise it
couldn't be used there
Diffstat (limited to 'ci/test/00_setup_env_arm.sh')
-rw-r--r-- | ci/test/00_setup_env_arm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 6e2542584c..4047f8ed8d 100644 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 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. -export QEMU_USER_CMD="${QEMU_USER_CMD:"qemu-arm -L /usr/arm-linux-gnueabihf/"}" +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" |