summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-01-25 20:15:45 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-01-25 20:15:45 -0600
commit2292ca0bbe82bd4efcc230df025f963e157e1ed4 (patch)
treefa01de9f084bbb1cbf6c7a88e328c74aa2522ce1
parent128dd21f840f4250ff67c94bd6b55e45ac6651d3 (diff)
tb: quoting issue with EXTRA_BUILDID
-rw-r--r--tb/tb_phases.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index e6daf74..0d9f2e8 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -85,14 +85,15 @@ local extra_buildid=""
extra_buildid="TinderBox: ${TB_NAME?}, Branch:${B}, Time: $current_timestamp"
fi
if [ "${R}" = "0" ] ; then
- if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} EXTRA_BUILDID="$extra_buildid" -sr > "tb_${B?}_build.log" 2>&1 ; then
+ export EXTRA_BUILDID="$extra_buildid"
+ if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr > "tb_${B?}_build.log" 2>&1 ; then
tb_REPORT_LOG="tb_${B?}_build.log"
tb_REPORT_MSGS="build failed - error is:"
R=1
else
# if we want to populate bibisect we need to 'install'
if [ "${tb_BUILD_TYPE?}" = "tb" -a ${TB_BIBISECT} != "0" ] ; then
- if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} EXTRA_BUILDID="${extra_buildid}" -sr install-tb >>"tb_${B?}_build.log" 2>&1 ; then
+ if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr install-tb >>"tb_${B?}_build.log" 2>&1 ; then
tb_REPORT_LOG="tb_${B}_build.log"
tb_REPORT_MSGS="build failed - error is:"
R=1