2 files changed, 57 insertions, 57 deletions
diff --git a/Test/rtest b/Test/rtest
index 55386bf0..83e9195e 100644..100755
--- a/Test/rtest
+++ b/Test/rtest
@@ -1,25 +1,25 @@
-#!/usr/bin/bash
-
-if [ $# -eq 0 ] ; then
-  echo "rtest: Error: Syntax: rtest testDirectory [ additionalTestArguments ... ]"
-  exit 1
-elif [ ! -d $1 ] ; then
-  echo rtest: Error: There is no test directory $1
-  exit 1
-fi
-
-TESTDIR=$1
-echo ----- Running regression test $TESTDIR
-cd $TESTDIR
-
-shift
-cmd /c .\\runtest.bat -nologo -logPrefix:$TESTDIR "$@" > Output
-# perl ../filter.pl Output Output.filtered
-# perl ../filter.pl Answer Answer.filtered
-# diff -w Answer.filtered Output.filtered > Diffs
-if c:/Windows/system32/fc /W Answer Output > /dev/null ; then
-  echo Succeeded
-else
-  echo FAILED
-fi
-cd ..
+#!/usr/bin/bash
+
+if [ $# -eq 0 ] ; then
+  echo "rtest: Error: Syntax: rtest testDirectory [ additionalTestArguments ... ]"
+  exit 1
+elif [ ! -d "$1" ] ; then
+  echo rtest: Error: There is no test directory $1
+  exit 1
+fi
+
+TESTDIR=$1
+echo ----- Running regression test $TESTDIR
+cd $TESTDIR
+
+shift
+sh runtest.sh /nologo /logPrefix:$TESTDIR "$@" > Output
+# perl ../filter.pl Output Output.filtered
+# perl ../filter.pl Answer Answer.filtered
+# diff -w Answer.filtered Output.filtered > Diffs
+if cmp /W Answer Output > /dev/null ; then
+  echo Succeeded
+else
+  echo FAILED
+fi
+cd ..
diff --git a/Test/rtestall b/Test/rtestall
index eecb5fda..64d0aaa5 100644..100755
--- a/Test/rtestall
+++ b/Test/rtestall
@@ -1,32 +1,32 @@
-#!/usr/bin/bash
-
-if [ "$1" == "short" ] ; then
-  shift
-  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+Use[[:space:]]" | awk '{print $1}'`
-elif [ "$1" == "long" ] ; then
-  shift
-  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+Long[[:space:]]" | awk '{print $1}'`
-else
-  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+(Use|Long)[[:space:]]" | awk '{print $1}'`
-fi
-
-if [ "$1" == "time" ] ; then
-  shift
-  TIME_CMD="time -p"
-else
-  TIME_CMD=""
-fi
-
-if [ "$1" == "reverse" ] || [ "$1" == "rev" ]; then
-  shift
-  ALL_TESTS=`echo ${ALL_TESTS} | sed -e 's/ /\n/g' | awk '{a[NR] = $0} END { for(i=NR; i; --i) print a[i]}'`
-fi
-
-for t in ${ALL_TESTS} ; do
-  # ${TIME_CMD} bash rtest $t "$@"
-  if [ "${TIME_CMD}" == "" ] ; then
-    ./runtest.bat $t "$@"
-  else
-    time -p ./runtest.bat $t "$@"
-  fi
-done
+#!/usr/bin/bash
+
+if [ "$1" == "short" ] ; then
+  shift
+  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+Use[[:space:]]" | awk '{print $1}'`
+elif [ "$1" == "long" ] ; then
+  shift
+  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+Long[[:space:]]" | awk '{print $1}'`
+else
+  ALL_TESTS=`cat alltests.txt | grep -E "^[^[:space:]]+[[:space:]]+(Use|Long)[[:space:]]" | awk '{print $1}'`
+fi
+
+if [ "$1" == "time" ] ; then
+  shift
+  TIME_CMD="time -p"
+else
+  TIME_CMD=""
+fi
+
+if [ "$1" == "reverse" ] || [ "$1" == "rev" ]; then
+  shift
+  ALL_TESTS=`echo ${ALL_TESTS} | sed -e 's/ /\n/g' | awk '{a[NR] = $0} END { for(i=NR; i; --i) print a[i]}'`
+fi
+
+for t in ${ALL_TESTS} ; do
+  # ${TIME_CMD} bash rtest $t "$@"
+  if [ "${TIME_CMD}" == "" ] ; then
+    sh runtest.sh $t "$@"
+  else
+    time -p sh runtest.sh $t "$@"
+  fi
+done