[llvm-commits] [test-suite] r153004 - /test-suite/trunk/RunSafely.sh

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 17 18:28:28 2012
New Revision: 153004

URL: http://llvm.org/viewvc/llvm-project?rev=153004&view=rev
Log:
[test-suite] RunSafely: Switch to using timeit --summary option instead of awk
horribleness.

Modified:
    test-suite/trunk/RunSafely.sh

Modified: test-suite/trunk/RunSafely.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafely.sh?rev=153004&r1=153003&r2=153004&view=diff
==============================================================================
--- test-suite/trunk/RunSafely.sh (original)
+++ test-suite/trunk/RunSafely.sh Sat Mar 17 18:28:28 2012
@@ -136,28 +136,20 @@
 COMMAND="$RUN_UNDER $PROGRAM $*"
 COMMAND=$(echo "$COMMAND" | sed -e 's#"#\\"#g')
 
-TIMEITCMD="$TIMEIT --posix --timeout $TIMELIMIT --chdir $PWD"
+TIMEITCMD="$TIMEIT --timeout $TIMELIMIT --chdir $PWD"
 if [ "x$RHOST" = x ] ; then
-  ( sh -c "$ULIMITCMD $TIMEITCMD sh -c '$COMMAND >$OUTFILE 2>&1 < $INFILE; echo exit \$?'" ) 2>&1 \
-    | awk -- '\
-BEGIN     { cpu = 0.0; }
-/^user/   { cpu += $2; print; }
-!/^user/  { print; }
-END       { printf("program %f\n", cpu); }' > $OUTFILE.time
+  rm -f "$OUTFILE.time"
+  sh -c "$ULIMITCMD $TIMEITCMD --summary $OUTFILE.time sh -c '$COMMAND >$OUTFILE 2>&1 < $INFILE'"
 else
   rm -f "$PWD/${PROG}.command"
   rm -f "$PWD/${PROG}.remote"
-  rm -f "$PWD/${PROG}.remote.time"
-  echo "$ULIMITCMD cd $PWD; ($TIMEITCMD sh -c '($COMMAND > $PWD/${OUTFILE}.remote 2>&1 < $INFILE;)'; echo exit \$?) > $PWD/${OUTFILE}.remote.time 2>&1" > "$PWD/${PROG}.command"
+  rm -f "$PWD/${OUTFILE}.remote.time"
+  echo "$ULIMITCMD cd $PWD; ($TIMEITCMD --summary $PWD/$OUTFILE.remote.time sh -c '($COMMAND > $PWD/${OUTFILE}.remote 2>&1 < $INFILE;)')" > "$PWD/${PROG}.command"
   chmod +x "$PWD/${PROG}.command"
 
   ( $RCLIENT -l $RUSER $RHOST $RPORT "ls $PWD/${PROG}.command" ) > /dev/null 2>&1
   ( $RCLIENT -l $RUSER $RHOST $RPORT "$PWD/${PROG}.command" )
-  cat $PWD/${OUTFILE}.remote.time | awk -- '\
-BEGIN     { cpu = 0.0; }
-/^user/   { cpu += $2; print; }
-!/^user/  { print; }
-END       { printf("program %f\n", cpu); }' > $OUTFILE.time
+  cp $PWD/${OUTFILE}.remote.time $OUTFILE.time
 sleep 1
 cp -f $PWD/${OUTFILE}.remote ${OUTFILE}
 rm -f $PWD/${OUTFILE}.remote