X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/aad4d54fa81ee0d4f02e868f82ff4296e225791b..9fad4d7ae54232c20df3ea2d874c2483aaca6c3c:/t/regress.t

diff --git a/t/regress.t b/t/regress.t
index 099b944..6a95a9f 100755
--- a/t/regress.t
+++ b/t/regress.t
@@ -3,29 +3,83 @@
 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
 	case "$option" in
-	-*) echo "Usage: $0 [<files>...]"; exit 64;;
+	-G) regenerate=1 && shift;;
+	-*) echo "Usage: $0 [-G] [<files>...]"; exit 64;;
 	esac
 done
 
-for candidate in ${@:-t*.in}
+for candidate in ${@:-t*.out}
 do
 	test_count=$((test_count+1))
-	file="${candidate%.in}"
-	test -r "$file.in" || continue
-
+	file="${candidate%.out}"
+	input="${file%%_-*}.in"
 	name="$(echo ${file#*-} | tr _ \ )"
-	cmd="barcat $file.in"
-	case "$name" in *\ -*) cmd="$cmd -${name#* -}";; esac
 
-	$cmd 2>&1 | $diffcmd "$file.out" - || printf 'not '
+	set -- barcat
+	[ -r "$input" ] && set -- "$@" "$input"
+	case "$name" in *\ -*) set -- "$@" -"${name#* -}";; esac
+	case "$name" in
+		*' |'*) set -- sh -c "\$0 \$1 | ${name#* |}" "$@";;
+		*)      set -- "$1" $2 $3
+	esac
+
+	if test -n "$regenerate"
+	then
+		if test -e $file.sh
+		then
+			echo "ok $test_count # skip $file.out"
+			continue
+		fi
+		"$@" >$file.out 2>&1
+	elif test -e "$file.out"
+	then
+		"$@" 2>&1 | diffcmd "$file.out" -
+	else
+		color 33
+		echo "not ok $test_count - $name # TODO"
+		color 0
+		continue
+	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"
+color 0
+exit $fail_count