t: strip options from input file names

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index 734e42dbc876cc4864868db745c33728497ab71a..6a95a9f54e7bc08ec5a7d4d7ca590c4334f13ca9 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -26,16 +26,20 @@ 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 *\ -*) set -- "$@" -"${name#* -}";; esac
+       case "$name" in
+               *' |'*) set -- sh -c "\$0 \$1 | ${name#* |}" "$@";;
+               *)      set -- "$1" $2 $3
+       esac
 
        if test -n "$regenerate"
        then
@@ -45,8 +49,14 @@ 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 != $?