From a9fdca2c1bfccf969a31337f6388cac468221c7e Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Sat, 13 Dec 2014 10:12:57 -0500 Subject: [PATCH] unitrun.sh: do not crash when no time.out file Signed-off-by: Jean Privat --- misc/jenkins/unitrun.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/misc/jenkins/unitrun.sh b/misc/jenkins/unitrun.sh index 3bb1766..6b1c7f5 100755 --- a/misc/jenkins/unitrun.sh +++ b/misc/jenkins/unitrun.sh @@ -26,9 +26,9 @@ shift # Detect a working time command if env time --quiet -f%U true 2>/dev/null; then - TIME="env time --quiet -f%U -o '${name}.t.out'" + TIME="env time --quiet -f%U -o ${name}.t.out" elif env time -f%U true 2>/dev/null; then - TIME="env time -f%U -o '${name}.t.out'" + TIME="env time -f%U -o ${name}.t.out" else TIME= fi @@ -48,9 +48,16 @@ res=$? c=`echo "${name%-*}" | tr "-" "."` n=${name##*-} +# Do we have a time result? +if test -f "${name}.t.out"; then + T="time='`cat "${name}.t.out"`'" +else + T= +fi + cat > "${name}.xml"< - + END if test "$res" != "0"; then echo >> "${name}.xml" "" @@ -67,4 +74,4 @@ cat >> "${name}.xml"< END -rm "${name}.out" "${name}.2.out" "${name}.t.out" +rm "${name}.out" "${name}.2.out" "${name}.t.out" 2> /dev/null || true -- 1.7.9.5