X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fscripts%2Fdo_tests.sh;h=ad9d18bb19a7ad8ef2e5713e8ac5e16f3ce0c20e;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=b95ca578cdbababbe0bfd9908e42f962c446b7c9;hpb=9d8e81db720417f58591ea42f72c6750b886a83d;p=helm.git

diff --git a/helm/matita/scripts/do_tests.sh b/helm/matita/scripts/do_tests.sh
index b95ca578c..ad9d18bb1 100755
--- a/helm/matita/scripts/do_tests.sh
+++ b/helm/matita/scripts/do_tests.sh
@@ -8,33 +8,70 @@ if [ "$1" = "-no-color" ]; then
   OK="OK"
   FAIL="FAIL"
 fi
+if [ "$1" = "-twice" ]; then
+  shift
+  TWICE=1
+fi
 
 COMPILER=$1
 shift
+CLEANCOMPILER=`echo $COMPILER | cut -d ' ' -f 1`
+CLEANER=$1
+shift
 LOGFILE=$1
 shift
+EXPECTED=$1
+shift
 TODO="$@"
 
-if [ -z "$COMPILER" -o -z "$LOGFILE" -o -z "$TODO" ]; then
+if [ -z "$COMPILER" -o -z "$CLEANER" -o -z "$LOGFILE" -o -z "$EXPECTED" -o -z "$TODO" ]; then
   echo
   echo "usage: "
-  echo "  do_tests.sh [-no-color] ./compiler logfile tests.ma ..."
+  echo "  do_tests.sh [-no-color] [-twice] ./compiler ./cleaner logfile expected_result test.ma ..."
   echo
+  echo "options:  "
+  echo "  -no-color Do not use vt100 colors"
+  echo "  -twice    Run each test twice but show only the second run times"
+  echo
+  echo "If expected_result is OK the result will be OK if the test compiles."
+  echo "Otherwise if expected_result is FAIL the result will be OK if the test"
+  echo "does not compile and the generated output is equal to test.log."
   echo "The value of the DO_TESTS_EXTRA evironment variable"
   echo "will be appended to each line."
   exit 1
 fi
 
-TMP=.__temp.txt
+LOG=.__log
+DIFF=.__diff
 
+export TIMEFORMAT="%2lR %2lU %2lS"
 for T in $TODO; do
-  echo -en "$COMPILER\t$T\t"
-  /usr/bin/time -o $TMP -f "%E\t%U\t%S" $COMPILER $T >> $LOGFILE 2>&1
-  if [ $? = 0 ]; then
-    echo -e "$OK\t`cat $TMP`\t$DO_TESTS_EXTRA"
+  printf "$CLEANCOMPILER\t%-30s   " $T
+  if [ "$TWICE" = "1" ]; then
+    $CLEANER $T 1>/dev/null 2>/dev/null
+    $COMPILER $T 1>/dev/null 2>/dev/null
+  fi
+  $CLEANER $T 1>/dev/null 2>/dev/null
+  TIMES=`(time $COMPILER $T > $LOG 2>&1) 2>&1`
+  RC=$?;
+  cat $LOG >> $LOGFILE
+  touch $DIFF
+  if [ $EXPECTED = "FAIL" ]; then
+   if [ $RC = 0 ]; then
+     echo "The test was successful but it should have failed!" > $DIFF
+     RC=1;
+   else
+     diff $LOG `basename $T .ma`.log > $DIFF
+     RC=$?
+     rm -f $LOG
+   fi
+  fi
+  if [ $RC = 0 ]; then
+    printf "$OK\t$TIMES\t$DO_TESTS_EXTRA\n"
   else
-    echo -e "$FAIL\t`cat $TMP`\t$DO_TESTS_EXTRA"
+    printf "$FAIL\t$TIMES\t$DO_TESTS_EXTRA\n";
+    cat $DIFF
   fi
+  rm -f $DIFF
+  exit $RC
 done
-
-rm $TMP