t: replace shell scripts by pipe parameters in name

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index 84f3c9975ebfeb5f9e875cfc84086dd153522726..734e42dbc876cc4864868db745c33728497ab71a 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -6,10 +6,16 @@ test_count=0
 fail_count=0
 
 COLUMNS=40
+colorize=
+test -t 1 && colorize=1
+color () {
+       test -n "$colorize" &&
+       printf '\e[%sm' $@
+}
 regenerate=
 diffcmd () {
        comm --nocheck-order --output-delimiter=::: -3 $@ |
-       perl -pe'END{exit !!$.} s/^:::/>/ || s/^/</'
+       perl -pe"END{exit !!\$.} s/^:::/$(color 31)>/ || s/^/$(color 32)</"
 }
 
 for option in "$@"
@@ -27,8 +33,9 @@ do
        test -r "$file.in" || continue
 
        name="$(echo ${file#*-} | tr _ \ )"
-       cmd="barcat $file.in"
-       case "$name" in *\ -*) cmd="$cmd -${name#* -}";; esac
+       set -- barcat "$file.in"
+       case "$name" in *\ -*) set -- "$@" "-${name#* -}";; esac
+       case "$name" in *' |'*)  set -- sh -c "\$0 \$1 $3" "$@";; esac
 
        if test -n "$regenerate"
        then
@@ -37,19 +44,32 @@ do
                        echo "ok $test_count # skip $file.out"
                        continue
                fi
-               $cmd >$file.out 2>&1
+               "$@" >$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
+               if test -e $file.out; then "$@" 2>&1 | diffcmd "$file.out" -; fi
        fi
 
        if test 0 != $?
        then
                fail_count=$((fail_count+1))
+               color 1\;31
                printf 'not '
        fi
        echo "ok $test_count - $name"
+       color 0
 done
 
+if test $fail_count = 0
+then
+       color 32
+       echo "# passed all $test_count test(s)"
+else
+       color 31
+       echo "# failed $fail_count among $test_count test(s)"
+       fail_count=1  # exit code
+fi
+
+color 0\;36
 echo "1..$test_count"
-exit $((fail_count>0))
+color 0
+exit $fail_count