prepare to fix spark distribution

[barcat.git] / t / regress.t

diff --git a/t/regress.t b/t/regress.t
index bde3eb42dfe0dbb30be1a5a9ea4a9b3019d6cec0..f6877b1e85169cb126e0c60d1ef63186c444732a 100755 (executable)
--- a/t/regress.t
+++ b/t/regress.t
@@ -26,7 +26,12 @@ do
        esac
 done
 
-for candidate in ${@:-t*.out}
+params="${@:-t*.out}"
+color 0\;36
+echo "1..$(echo $params | wc -w)"
+color 0
+
+for candidate in $params
 do
        test_count=$((test_count+1))
        file="${candidate%.out}"
@@ -35,12 +40,17 @@ do
 
        set -- barcat
        [ -r "$input" ] && set -- "$@" "$input"
-       case "$name" in *\ -*) set -- "$@" -"${name#* -}";; esac
+       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#* |}" "$@";;
-               *)      set -- "$1" $2 $3
+               *)      eval set -- "$1" $2 $3
        esac
 
        if test -n "$regenerate"
@@ -63,8 +73,15 @@ do
 
        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"
@@ -80,8 +97,6 @@ else
        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