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_s390x.sh | |
| parent | fa5d709fb266c97d4db15006bf855e887a6c123b (diff) | |
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_s390x.sh')
| -rw-r--r-- | ci/test/00_setup_env_s390x.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index 637d549553..a4f4841848 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 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"}" +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 RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=true |