strip pipe arguments from test options

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index 8f92ee7958524d98054349813aaad47c0791cd2a..508d3617bc7e6fe7c7562aed1c54f70745649426 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -26,18 +26,26 @@ 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
+
+       set -- barcat
+       [ -r "$input" ] && set -- "$@" "$input"
+       case "$name" in
+               *\ -*)
+                       args="${name#* -}"
+                       set -- "$@" -"${args% [?|]*}"
+                       ;;
+       esac
        case "$name" in
-               *' |'*) set -- sh -c "\$0 \$1 $3" "$@";;
-               *)      set -- "$1" "$2" $3
+               *' ?' ) 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"