t: exit code reflects test failures

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index 1463ce308512672f05197f38014235d0a5a3b157..84f3c9975ebfeb5f9e875cfc84086dd153522726 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -3,10 +3,14 @@
 cd "${0%/*}" || exit 1
 
 test_count=0
+fail_count=0
 
 COLUMNS=40
-diffcmd='diff --unchanged-line-format= --old-line-format=<%L --new-line-format=>%L'
 regenerate=
+diffcmd () {
+       comm --nocheck-order --output-delimiter=::: -3 $@ |
+       perl -pe'END{exit !!$.} s/^:::/>/ || s/^/</'
+}
 
 for option in "$@"
 do
@@ -28,18 +32,24 @@ do
 
        if test -n "$regenerate"
        then
-               if test -e $file.out
+               if test -e $file.sh
                then
-                       echo "ok $test_count # skip existing $file.out"
+                       echo "ok $test_count # skip $file.out"
                        continue
                fi
                $cmd >$file.out 2>&1
        else
-               $cmd 2>&1 | $diffcmd "$file.out" -
+               if test -e $file.sh;  then $cmd 2>&1 | ./$file.sh; fi &&
+               if test -e $file.out; then $cmd 2>&1 | diffcmd "$file.out" -; fi
        fi
 
-       test 0 = $? || printf 'not '
+       if test 0 != $?
+       then
+               fail_count=$((fail_count+1))
+               printf 'not '
+       fi
        echo "ok $test_count - $name"
 done
 
 echo "1..$test_count"
+exit $((fail_count>0))