merge

1 files changed, 32 insertions, 32 deletions

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