commit: 3a6d81ff2e6f99df8815719e514f3d30989348fc
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 16:13:32 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 30 16:13:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a6d81ff
catalyst-auto: do not fail if /usr/bin/time is not present.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e038898..719c3cc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -303,6 +303,9 @@ fi
build_failure=0
+timeprefix=""
+which time >/dev/null && timeprefix="time"
+
for a in "" ${SETS}; do
if [ -z "${a}" ]; then
specs_var="SPECS"
@@ -314,7 +317,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e
's:\.spec$::').log"
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}"
${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -324,7 +327,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e
's:\.spec$::').log"
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}"
${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
@@ -334,7 +337,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e
's:\.spec$::')_purge.log"
- run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "${timeprefix} catalyst -P -c ${CATALYST_CONFIG} -f ${i}"
"${LOGFILE}"
done
update_symlinks
