X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/c2ae9e650f0d3527d320ce00adb51f380f5ed6aa..4c703b580c40651e0f2c6aa6e83e5cf614c3bbde:/t/regress.t

diff --git a/t/regress.t b/t/regress.t
index 734e42d..e149b36 100755
--- a/t/regress.t
+++ b/t/regress.t
@@ -26,16 +26,27 @@ do
 	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 _ \ )"
-	set -- barcat "$file.in"
-	case "$name" in *\ -*) set -- "$@" "-${name#* -}";; esac
-	case "$name" in *' |'*)  set -- sh -c "\$0 \$1 $3" "$@";; esac
+
+	set -- barcat
+	[ -r "$input" ] && set -- "$@" "$input"
+	case "$name" in
+		*\ -*)
+			args="${name#* -}"
+			set -- "$@" -"${args% [?|]*}"
+			;;
+	esac
+	case "$name" in
+		*' ?' ) set -- sh -c "\$0 \$@ 2>/dev/null" "$@";;
+		*' ?'*) set -- sh -c "\$0 \$@ | test \$\? = ${name#* \?}" "$@";;
+		*' |'*) set -- sh -c "\$0 \$@ | ${name#* |}" "$@";;
+		*)      eval set -- "$1" $2 $3
+	esac
 
 	if test -n "$regenerate"
 	then
@@ -45,14 +56,27 @@ do
 			continue
 		fi
 		"$@" >$file.out 2>&1
+	elif test -e "$file.out"
+	then
+		"$@" 2>&1 | diffcmd "$file.out" -
 	else
-		if test -e $file.out; then "$@" 2>&1 | diffcmd "$file.out" -; fi
+		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
+		case "$name" in
+		*' #TODO')
+			color 33
+			;;
+		*)
+			fail_count=$((fail_count+1))
+			color 1\;31
+		esac
+
 		printf 'not '
 	fi
 	echo "ok $test_count - $name"