[llvm-commits] [test-suite] r93407 - in /test-suite/trunk: Makefile.programs RunSafely.sh

[Rafael Espindola]

Author: rafael
Date: Wed Jan 13 20:10:24 2010
New Revision: 93407

URL: http://llvm.org/viewvc/llvm-project?rev=93407&view=rev
Log:
Add the -u (run under) option to RunSafely.sh
Update Makefile to pass RUNUNDER to RunSafely.sh

Modified:
    test-suite/trunk/Makefile.programs
    test-suite/trunk/RunSafely.sh

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=93407&r1=93406&r2=93407&view=diff

==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Wed Jan 13 20:10:24 2010
@@ -82,29 +82,36 @@
 else
 EXIT_OK := 0
 endif
+
 ifdef GET_STABLE_NUMBERS
 RUNSAFELY := $(PROGDIR)/RunSafelyAndStable.sh $(RUNTIMELIMIT) $(EXIT_OK)
 else
+RUNSAFELY := $(PROGDIR)/RunSafely.sh
+
 ifdef REMOTE_HOST
+RUNSAFELY := $(RUNSAFELY) -r $(REMOTE_HOST)
 ifndef REMOTE_CLIENT
 REMOTE_CLIENT := rsh
 endif
+endif
+
 ifdef REMOTE_USER
-ifdef REMOTE_PORT
-RUNSAFELY := $(PROGDIR)/RunSafely.sh -r $(REMOTE_HOST) -l $(REMOTE_USER) -rc $(REMOTE_CLIENT) -rp "$(REMOTE_PORT)" $(RUNTIMELIMIT) $(EXIT_OK)
-else
-RUNSAFELY := $(PROGDIR)/RunSafely.sh -r $(REMOTE_HOST) -l $(REMOTE_USER) -rc $(REMOTE_CLIENT) $(RUNTIMELIMIT) $(EXIT_OK)
+RUNSAFELY := $(RUNSAFELY) -l $(REMOTE_USER)
 endif
-else
-ifdef REMOTE_PORT
-RUNSAFELY := $(PROGDIR)/RunSafely.sh -r $(REMOTE_HOST) -rc $(REMOTE_CLIENT) -rp "$(REMOTE_PORT)" $(RUNTIMELIMIT) $(EXIT_OK)
-else
-RUNSAFELY := $(PROGDIR)/RunSafely.sh -r $(REMOTE_HOST) -rc $(REMOTE_CLIENT) $(RUNTIMELIMIT) $(EXIT_OK)
+
+ifdef REMOTE_CLIENT
+RUNSAFELY := $(RUNSAFELY) -rc $(REMOTE_CLIENT)
 endif
+
+ifdef REMOTE_PORT
+RUNSAFELY := $(RUNSAFELY) -rp "$(REMOTE_PORT)"
 endif
-else
-RUNSAFELY := $(PROGDIR)/RunSafely.sh $(RUNTIMELIMIT) $(EXIT_OK)
+
+ifdef RUNUNDER
+RUNSAFELY := $(RUNSAFELY) -u $(RUNUNDER)
 endif
+
+RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT) $(EXIT_OK)
 endif
 
 RUNTOOLSAFELY := $(PROGDIR)/RunToolSafely.sh $(RUNTIMELIMIT)

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

==============================================================================
--- test-suite/trunk/RunSafely.sh (original)
+++ test-suite/trunk/RunSafely.sh Wed Jan 13 20:10:24 2010
@@ -25,6 +25,7 @@
 # Syntax: 
 #
 #   RunSafely.sh [-r <rhost>] [-l <ruser>] [-rc <client>] [-rp <port>]
+#                [-u <under>]
 #                <timeout> <exitok> <infile> <outfile> <program> <args...>
 #
 #   where:
@@ -32,6 +33,7 @@
 #     <ruser>   is the username on the remote host
 #     <client>  is the remote client used to execute the program
 #     <port>    is the port used by the remote client
+#     <under>   is a wrapper that the program is run under
 #     <timeout> is the maximum number of seconds to let the <program> run
 #     <exitok>  is 1 if the program must exit with 0 return code
 #     <infile>  is a file from which standard input is directed
@@ -54,6 +56,7 @@
 RUSER=`id -un`
 RCLIENT=rsh
 RPORT=
+RUN_UNDER=
 if [ $1 = "-r" ]; then
   RHOST=$2
   shift 2
@@ -70,6 +73,10 @@
   RPORT="-p $2"
   shift 2
 fi
+if [ $1 = "-u" ]; then
+  RUN_UNDER=$2
+  shift 2
+fi
 
 ULIMIT=$1
 EXITOK=$2
@@ -121,7 +128,7 @@
 # necessary I/O redirection.
 #
 PWD=`pwd`
-COMMAND="$PROGRAM $*"
+COMMAND="$RUN_UNDER $PROGRAM $*"
 if [ "$SYSTEM" = "Darwin" ]; then
   COMMAND="${DIR}TimedExec.sh $ULIMIT $PWD $COMMAND"
 fi