diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-29 13:01:56 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-29 13:13:47 +0000 |
| commit | 7816b69dda7caade8d8e2e6e6a3edd39904b9784 (patch) | |
| tree | e5c8996819b8b17fe7eb88ab1ad8f3fac24189b0 /tcwg-buildfarm.sh | |
| parent | 5cbd5427c0cd2fcfdbb30cdcfee57eadc3bcf19d (diff) | |
tcwg-buildfarm.sh: Fix ILP32 builds
Convert $target_opt into bash array to fix quoting issues when passing
"--override \"--extraconfigdir ../config/ilp32-dev\"" to jenkins.sh.
Current quoting make the above into 3 arguments:
1: --override
2: "--extraconfigdir
3: ../config/ilp32-dev"
instead of
1: --override
2: --extraconfigdir ../config/ilp32-dev
Change-Id: I1441c038f27bde3db254b003140ab73ad2969672
Diffstat (limited to 'tcwg-buildfarm.sh')
| -rwxr-xr-x | tcwg-buildfarm.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index 7fa08486..c17c16b5 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -46,11 +46,11 @@ set -u host=$(print_type_for_label $label) if [ x"$target" = x"$label" ]; then - target_opt="--target native" + target_opt=(--target native) elif [ x"$target" = x"aarch64-linux-gnu_ilp32" ]; then - target_opt="--target $target --override \"--extraconfigdir ../config/ilp32-dev\"" + target_opt=(--target $target --override "--extraconfigdir ../config/ilp32-dev") else - target_opt="--target $target" + target_opt=(--target $target) fi runtests_opt="" @@ -160,7 +160,7 @@ echo linaro.org | sudo tee /etc/mailname sudo postmap hash:/etc/postfix/sasl_password sudo /etc/init.d/postfix start -cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override "$override ${qemu_cpu}" $target_opt --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} ${send_results_to} --logserver $log_server $logname_opt $norebuild $options || result=$? +cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override "$override ${qemu_cpu}" "${target_opt[@]}" --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} ${send_results_to} --logserver $log_server $logname_opt $norebuild $options || result=$? if $dryrun; then # Keep Jenkins happy |