[llvm-commits] [test-suite] r93613 - in /test-suite/trunk: RunSafely.sh TimedExec.sh

[Rafael Espindola]

Author: rafael
Date: Fri Jan 15 19:27:36 2010
New Revision: 93613

URL: http://llvm.org/viewvc/llvm-project?rev=93613&view=rev
Log:
Make TimedExec.sh work on Linux.
Use TimedExec.sh in every system.

Modified:
    test-suite/trunk/RunSafely.sh
    test-suite/trunk/TimedExec.sh

Modified: test-suite/trunk/RunSafely.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafely.sh?rev=93613&r1=93612&r2=93613&view=diff

==============================================================================
--- test-suite/trunk/RunSafely.sh (original)
+++ test-suite/trunk/RunSafely.sh Fri Jan 15 19:27:36 2010
@@ -129,9 +129,7 @@
 #
 PWD=`pwd`
 COMMAND="$RUN_UNDER $PROGRAM $*"
-if [ "$SYSTEM" = "Darwin" ]; then
-  COMMAND="${DIR}TimedExec.sh $ULIMIT $PWD $COMMAND"
-fi
+COMMAND="${DIR}TimedExec.sh $ULIMIT $PWD $COMMAND"
 
 if [ "x$RHOST" = x ] ; then
   ( sh -c "$ULIMITCMD time -p sh -c '$COMMAND >$OUTFILE 2>&1 < $INFILE; echo exit \$?'" ) 2>&1 \

Modified: test-suite/trunk/TimedExec.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TimedExec.sh?rev=93613&r1=93612&r2=93613&view=diff

==============================================================================
--- test-suite/trunk/TimedExec.sh (original)
+++ test-suite/trunk/TimedExec.sh Fri Jan 15 19:27:36 2010
@@ -33,7 +33,7 @@
     while [ $SEC -lt $TIMEOUT ]; do
         sleep 1
         # Check if parent has completed.
-        kill -s INFO $PARENT 2>/dev/null
+        kill -0 $PARENT 2>/dev/null
         if [ $? -eq 1 ]; then
             exit 0
         fi