t: replace diff by comm for linewise comparison

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index 099b944632d4166f22891e1bdc55fec56a727907..45ee5ba2b64d56682f78719e1520bfbe7943da50 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -5,12 +5,17 @@ cd "${0%/*}" || exit 1
 test_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
        case "$option" in
-       -*) echo "Usage: $0 [<files>...]"; exit 64;;
+       -G) regenerate=1 && shift;;
+       -*) echo "Usage: $0 [-G] [<files>...]"; exit 64;;
        esac
 done
 
@@ -24,7 +29,20 @@ do
        cmd="barcat $file.in"
        case "$name" in *\ -*) cmd="$cmd -${name#* -}";; esac
 
-       $cmd 2>&1 | $diffcmd "$file.out" - || printf 'not '
+       if test -n "$regenerate"
+       then
+               if test -e $file.sh
+               then
+                       echo "ok $test_count # skip $file.out"
+                       continue
+               fi
+               $cmd >$file.out 2>&1
+       else
+               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 '
        echo "ok $test_count - $name"
 done