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

[Evan Cheng]

Author: evancheng
Date: Fri Feb 29 12:01:13 2008
New Revision: 47756

URL: http://llvm.org/viewvc/llvm-project?rev=47756&view=rev
Log:
Try to make remote testing more robust.

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=47756&r1=47755&r2=47756&view=diff

==============================================================================
--- test-suite/trunk/RunSafely.sh (original)
+++ test-suite/trunk/RunSafely.sh Fri Feb 29 12:01:13 2008
@@ -104,8 +104,14 @@
   COMMAND="${DIR}TimedExec.sh $ULIMIT $PWD $COMMAND"
 fi
 
+rm -f "$PWD/${PROGRAM}.command"
+rm -f "$PWD/${PROGRAM}.remote"
+rm -f "$PWD/${PROGRAM}.remote.time"
+echo "$ULIMITCMD (time -p ($COMMAND > $PWD/$OUTFILE.remote 2>&1 < $INFILE;); echo exit $?) > $PWD/$OUTFILE.remote.time 2>&1" > "$PWD/${PROGRAM}.command"
+chmod +x "$PWD/${PROGRAM}.command"
+
 if [ "x$RHOST" = x ] ; then
-  ( sh -c "$ULIMITCMD time -p $COMMAND >$OUTFILE 2>&1 < $INFILE; echo exit \$?" ) 2>&1 \
+  ( sh -c "$ULIMITCMD"; time -p sh -c "$COMMAND >$OUTFILE 2>&1 < $INFILE" ; echo exit $? ) 2>&1 \
     | awk -- '\
 BEGIN     { cpu = 0.0; }
 /^user/   { cpu += $2; print; }
@@ -113,15 +119,18 @@
 !/^user/ && !/^sys/  { print; }
 END       { printf("program %f\n", cpu); }' > $OUTFILE.time
 else
-  ( rsh -l $RUSER $RHOST "$ULIMITCMD cd $PWD; time -p $COMMAND >$OUTFILE.remote 2>&1 < $INFILE; echo exit \$?" ) 2>&1 \
-    | awk -- '\
+  ( rsh -l $RUSER $RHOST "ls $PWD/${PROGRAM}.command" ) > /dev/null 2>&1
+  ( rsh -l $RUSER $RHOST "$PWD/${PROGRAM}.command" )
+  cat $OUTFILE.remote.time | awk -- '\
 BEGIN     { cpu = 0.0; }
 /^user/   { cpu += $2; print; }
 /^sys/    { cpu += $2; print; }
 !/^user/ && !/^sys/  { print; }
 END       { printf("program %f\n", cpu); }' > $OUTFILE.time
-cp $OUTFILE.remote $OUTFILE
+sleep 1
+cp -f $OUTFILE.remote $OUTFILE
 rm -f $OUTFILE.remote
+rm -f $OUTFILE.remote.time
 fi
 
 exitval=`grep '^exit ' $OUTFILE.time | sed -e 's/^exit //'`