X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fscripts%2Fdo_tests.sh;h=a195b9cf0ee4ba816e29bbe917e3d2101db7c8de;hb=e6b28085c97ae7b9bd3f3262b105f6b84f42b047;hp=080ff2adaf9a81908ffde12dc814ecb59ec2e996;hpb=244b44d6490eeb5f7cb89e83cfb6e22e9394ba11;p=helm.git diff --git a/helm/matita/scripts/do_tests.sh b/helm/matita/scripts/do_tests.sh index 080ff2ada..a195b9cf0 100755 --- a/helm/matita/scripts/do_tests.sh +++ b/helm/matita/scripts/do_tests.sh @@ -15,14 +15,16 @@ fi COMPILER=$1 shift +CLEANER=$1 +shift LOGFILE=$1 shift TODO="$@" -if [ -z "$COMPILER" -o -z "$LOGFILE" -o -z "$TODO" ]; then +if [ -z "$COMPILER" -o -z "$CLEANER" -o -z "$LOGFILE" -o -z "$TODO" ]; then echo echo "usage: " - echo " do_tests.sh [-no-color] [-twice] ./compiler logfile tests.ma ..." + echo " do_tests.sh [-no-color] [-twice] ./compiler ./cleaner logfile tests.ma ..." echo echo "options: " echo " -no-color Do not use vt100 colors" @@ -36,16 +38,20 @@ fi TMP=.__temp.txt for T in $TODO; do - echo -en "$COMPILER\t$T\t" + printf "$COMPILER\t%-30s " $T if [ "$TWICE" = "1" ]; then + $CLEANER $T 1>/dev/null 2>/dev/null $COMPILER $T 1>/dev/null 2>/dev/null fi - /usr/bin/time --quiet -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" + $CLEANER $T 1>/dev/null 2>/dev/null + /usr/bin/time --quiet -o $TMP -f "%E %U %S" $COMPILER $T >> $LOGFILE 2>&1 + RC=$?; + if [ $RC = 0 ]; then + printf "$OK\t`cat $TMP`\t$DO_TESTS_EXTRA\n" + rm $TMP else - echo -e "$FAIL\t`cat $TMP`\t$DO_TESTS_EXTRA" + printf "$FAIL\t`cat $TMP`\t$DO_TESTS_EXTRA\n"; + rm $TMP + exit $RC fi done - -rm $TMP