Reimplement in terms of the support for this feature in the makefiles with

the "check-one" target. This was necessitated by the change in the test
harness to fully use Tcl's "exec" function and avoid shell scripts
altogether. Consequently, to be accurate, TestRunner.sh needs to invoke the
same environment as dejagnu would, but for just a single test. That's what
the make target "check-one" does so we just invoke it here.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36051 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/TestRunner.sh b/test/TestRunner.sh
index 2c96fd5b48672fb2ac1f9cbec9c48e46d54cc281..4e3d190e4accb19e3df6fde2d2bfb15a4874faa7 100755 (executable)
--- a/test/TestRunner.sh
+++ b/test/TestRunner.sh
@@ -12,39 +12,4 @@
 #     %llvmgxx - llvm-g++ command
 #     %prcontext - prcontext.tcl script
 #
-
-FILENAME=$1
-TESTNAME=$1
-SUBST=$1
-FILENAME_ONLY=`basename $1`
-OUTPUT=Output/$FILENAME_ONLY.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|llvm-gcc -emit-llvm|g;s|%llvmgxx|llvm-g++ -emit-llvm|g;s|%prcontext|prcontext.tcl|g" > $SCRIPT
-
-grep -q XFAIL $FILENAME && (printf "XFAILED '$TESTNAME': "; grep XFAIL $FILENAME)
-
-/bin/sh $SCRIPT > $OUTPUT 2>&1 || (
-  echo "******************** TEST '$TESTNAME' FAILED! ********************"
-  echo "Command: "
-  cat $SCRIPT
-  echo "Output:"
-  cat $OUTPUT
-  rm $OUTPUT
-  echo "******************** TEST '$TESTNAME' FAILED! ********************"
-)
-
+make check-one TESTONE=$1