X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/9aa6d010ebaf2d3ad8e6cad435a54748fb2572e2..2f41dadf7f9a08522a7e84cfd28f847fd1428366:/t/regress.t

diff --git a/t/regress.t b/t/regress.t
index 1463ce3..b8d05dd 100755
--- a/t/regress.t
+++ b/t/regress.t
@@ -3,10 +3,20 @@
 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'
+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/^:::/$(color 31)>/ || s/^/$(color 32)</"
+}
 
 for option in "$@"
 do
@@ -28,18 +38,38 @@ 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))
+		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"
+color 0
+exit $fail_count