RunSafely.sh: Allow the specification of a working directory

[MatzeB]

Summary

Also changes the lit tests to recognize a

cd $DIR ; command

pattern and change it into the apropriate RunSafely.sh options.

It also adds a convenience WORKDIR option to the llvm_test_run() cmake macro.

RunSafely.sh

 #           fourth argument specified, and outputs a <outfile>.time file which
 #           contains a timing of the program and the program's exit code.
 #
 #           If optional parameters -r <remote host> -l <remote user> are
 #           specified, it execute the program remotely using rsh.
 #
 # Syntax:
 #
-#   RunSafely.sh [-r <rhost>] [-l <ruser>] [-rc <client>] [-rp <port>]
-#                [-u <under>] [--show-errors] [--omit-exitval] -t <timeit>
-#                <timeout> <infile> <outfile> <program> <args...>
+#   RunSafely.sh [--omit-exitval] [-d <workdir>] [-r <rhost>] [-l <ruser>]
+#                [-rc <client>] [-rp <port>] [-u <under>] [--show-errors]
+#                -t <timeit> <timeout> <infile> <outfile> <program> <args...>
 #
 #   where:
+#     <workdir> is the directory where the program is executed
 #     <rhost>   is the remote host to execute the program
 #     <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
 #     <timeit>  is a wrapper that is used to collect timing data
 #     <timeout> is the maximum number of seconds to let the <program> run
 #     <infile>  is a file from which standard input is directed

 RHOST=
 RUSER=`id -un`
 RCLIENT=rsh
 RPORT=
 RUN_UNDER=
 TIMEIT=
 SHOW_ERRORS=0
 OMIT_EXITVAL=0
+PWD=`pwd`
 if [ $1 = "--omit-exitval" ]; then
-  OMIT_EXITVAL=1
-  shift 1
+  OMIT_EXITVAL=1
+  shift 1
 fi
+if [ $1 = "-d" ]; then
+  PWD="$2"
+  shift 2
+fi
 if [ $1 = "-r" ]; then
   RHOST=$2
   shift 2
 fi
 if [ $1 = "-l" ]; then
   RUSER=$2
   shift 2
 fi

 # We set the limit at 100MB.
 LIMITARGS="$LIMITARGS --limit-file-size 104857600"
 
 # Set the virtual memory limit at 800MB.
 LIMITARGS="$LIMITARGS --limit-rss-size 838860800"
 
 # Run the command, timing its execution and logging the status summary to
 # $OUTFILE.time.
-PWD=`pwd`
 COMMAND="$RUN_UNDER $PROGRAM $*"
 
 TIMEITCMD="$TIMEIT $LIMITARGS --timeout $TIMELIMIT --chdir $PWD"
 if [ "x$RHOST" = x ] ; then
   rm -f "$OUTFILE.time"
   $TIMEITCMD \
       --summary $OUTFILE.time \
       --redirect-input $INFILE \

cmake/modules/SingleMultiSource.cmake

if(${name_idx} EQUAL -1)
     append_ldflags(${source_exename} LDFLAGS)
     llvm_add_test(${PROG} ${source_exename})
     add_dependencies(${source_exename} timeit fpcmp)
   endif()
   endif()
 endmacro()
 
 macro(llvm_test_run)
-  CMAKE_PARSE_ARGUMENTS(ARGS "" "RUN_TYPE;EXECUTABLE" "" ${ARGN})
+  CMAKE_PARSE_ARGUMENTS(ARGS "" "RUN_TYPE;EXECUTABLE;WORKDIR" "" ${ARGN})
   # If no executable is specified use $EXECUTABLE$ placeholder which will be
   # replaced later.
   if(NOT DEFINED ARGS_EXECUTABLE)
     set(ARGS_EXECUTABLE "$EXECUTABLE$")
   endif()
   if(NOT DEFINED TESTSCRIPT)
     set(TESTSCRIPT "" PARENT_SCOPE)
   endif()
+  if(DEFINED ARGS_WORKDIR)
+    set(ARGS_EXECUTABLE "cd ${ARGS_WORKDIR} ; ${ARGS_EXECUTABLE}")
+  endif()
   # ARGS_UNPARSED_ARGUMENTS is a semicolon-separated list. Change it into a
   # whitespace-separated string.
   string(REPLACE ";" " " JOINED_ARGUMENTS "${ARGS_UNPARSED_ARGUMENTS}")
   if(NOT DEFINED ARGS_RUN_TYPE OR "${ARGS_RUN_TYPE}" STREQUAL "${RUN_TYPE}")
     set(TESTSCRIPT "${TESTSCRIPT}RUN: ${ARGS_EXECUTABLE} ${JOINED_ARGUMENTS}\n")
   endif()
 endmacro()
 

lit.cfg

def execute(self, test, litConfig):
         substitutions += [('%o', outfile)]
         runscript = applySubstitutions(runscript, substitutions)
         verifyscript = applySubstitutions(verifyscript, substitutions)
 
         # Prepend runscript with RunSafely and timeit stuff
         def prependRunSafely(line):
             # Search for "< INPUTFILE" in the line and use that for stdin
             stdin = "/dev/null"
+            stdout = outfile
+            workdir = None
             commandline = shlex.split(line)
-            for i in range(len(commandline)):
-                if commandline[i] == "<" and i+1 < len(commandline):
+            i = 0
+            while i < len(commandline):
+                if i+2 < len(commandline) and commandline[i] == "cd" \
+                   and commandline[i+2] == ";":
+                    workdir = commandline[i+1]
+                    del commandline[i+2]
+                    del commandline[i+1]
+                    del commandline[i]
+                elif commandline[i] == "<" and i+1 < len(commandline):
                     stdin = commandline[i+1]
                     del commandline[i+1]
                     del commandline[i]
-                    break
+                elif commandline[i] == ">" and i+1 < len(commandline):
+                    stdout = commandline[i+1]
+                    del commandline[i+1]
+                    del commandline[i]
+                else:
+                    i += 1
             timeit = "%s/tools/timeit" % config.test_source_root
             runsafely = "%s/RunSafely.sh" % config.test_suite_root
             timeout = "7200"
-            runsafely_prefix = [runsafely, "-t", timeit, timeout, stdin,
-                                outfile]
+            runsafely_prefix = [runsafely]
             if not config.output_append_exitstatus:
-                runsafely_prefix.insert(1, "--omit-exitval")
+                runsafely_prefix += ["--omit-exitval"]
+            if workdir is not None:
+                runsafely_prefix += ["-d", workdir]
+            runsafely_prefix += ["-t", timeit, timeout, stdin, stdout]
 
             line = " ".join(map(quote, runsafely_prefix + commandline))
             return line
         runscript = map(prependRunSafely, runscript)
 
         # Create the output directory if it does not already exist.
         lit.util.mkdir_p(os.path.dirname(tmpBase))