# immediately after a "RUN:" string.
#
# This runner recognizes and replaces the following strings in the command:
-# %s - Replaced with the input name of the program
#
+# %s - Replaced with the input name of the program, or the program to
+# execute, as appropriate.
+#
+
+FILENAME=$1
+TESTNAME=$1
+SUBST=$1
+OUTPUT=Output/$FILENAME.out
+
+# create the output directory if it does not already exist
+mkdir Output > /dev/null 2>&1
+
+if test $# != 1; then
+ # If more than one parameter is passed in, there must be three parameters:
+ # The filename to read from (already processed), the command used to execute,
+ # and the file to output to.
+ SUBST=$2
+ OUTPUT=$3
+ TESTNAME=$3
+fi
+
+ulimit -t 40
+
+SCRIPT=$OUTPUT.script
+grep 'RUN:' $FILENAME | sed "s|^.*RUN:\(.*\)$|\1|g;s|%s|$SUBST|g;s|%llvmgcc|llvmgcc|g" > $SCRIPT
-PROGRAM=`grep 'RUN:' $1 | sed "s/^.*RUN:\(.*\)$/\1/g;s/%s/$1/g" | head -n 1`
-OUTPUT=Output/$1.out
-($PROGRAM) > $OUTPUT 2>&1 || (
- echo "******************** TEST '$1' FAILED! ********************"
- echo "Command: " $PROGRAM
+/bin/sh $SCRIPT > $OUTPUT 2>&1 || (
+ echo "******************** TEST '$TESTNAME' FAILED! ********************"
+ echo "Command: "
+ cat $SCRIPT
echo "Output:"
cat $OUTPUT
rm $OUTPUT
- echo "******************** TEST '$1' FAILED! ********************"
+ echo "******************** TEST '$TESTNAME' FAILED! ********************"
)