diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-14 14:17:03 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-26 10:44:43 +0000 |
commit | d993e2699ac3a33a416bba0058f5bda8158fa309 (patch) | |
tree | 459ca47930d1f640110227f89f7dc9efd39f71b6 /tcwg-benchmark.sh | |
parent | 1aa722d8a8ff64bf600154a966321e994e4d012d (diff) |
Don't ignore "null" values in variable expansions
Replace ${var:-default} with ${var-default}.
I learned something new about shell scripting today. From bash manual:
===
When not performing substring expansion, using the form described
below (e.g., ‘:-’), Bash tests for a parameter that is unset or null.
Omitting the colon results in a test only for a parameter that is
unset. Put another way, if the colon is included, the operator tests
for both parameter’s existence and that its value is not null; if
the colon is omitted, the operator tests only for existence.
===
The immediate problem I need to fix is handling of
host_aarchXX_excludecheck and host_x86_64_excludecheck parameters
in tcwg-buildfarm.sh. With ":-" syntax the empty ("null") values are
replaced by defaults, causing GCC testsuite to be ignored on aarchXX
hosts when "--host_aarchXX_excludecheck ''" is given.
There happens to be a single usage ":-" in ${rw:-rw} in
start-container-qemu.sh, where ":-" is actually needed.
Change-Id: Ibc8e070b698e1c76e2161eb65d40639b8cdec1f3
Diffstat (limited to 'tcwg-benchmark.sh')
-rwxr-xr-x | tcwg-benchmark.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh index 15e133f2..6128b125 100755 --- a/tcwg-benchmark.sh +++ b/tcwg-benchmark.sh @@ -6,9 +6,9 @@ set -ex # Make shellcheck happy and workaround Jenkins not defining variables # for empty arguments. -build_container_tag="${build_container_tag:-xenial-tcwg-tested}" +build_container_tag="${build_container_tag-xenial-tcwg-tested}" toolchain_url="$toolchain_url" -toolchain_type="${toolchain_type:-auto}" +toolchain_type="${toolchain_type-auto}" bench_list="$bench_list" cflags="$cflags" extension="$extension" |