fix tap diagnostic

[zpackage] / t / tap.sh

diff --git a/t/tap.sh b/t/tap.sh
index 00530027795577e8cd9d51c46b297e34461f5b4c..e3a345784092fb12475e02d4bdd2b4395ae76cd4 100755 (executable)
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -4,37 +4,41 @@ tn=0
 planned=0
 
 tryrun() {
-       note="$@"
+       if [ "$1" = "-v" ]; then
+               allout=1
+               shift
+       else
+               allout=0
+       fi
+
        program=$1
        shift
+
        $program "$@" > test.out 2>&1
-       tap_return_value=$?
-       if [ $tap_return_value -ne 0 ]; then
+       tap_rv=$?
+       tn=$((tn + 1))
+
+       if [ $tap_rv -ne 0 ]; then
                printf 'not ';
        fi
-       tn=$((tn + 1))
        printf 'ok %d - %s %s\n' $tn $program "$*"
-       if [ $tap_return_value -ne 0 ]; then
-               cat test.out | diagstdin
+
+       if [ $allout -eq 1 ] || [ $tap_rv -ne 0 ]; then
+               if test -s test.out; then
+                       cat test.out | diagstdin
+               fi
+               rm test.out
        fi
-       return $tap_return_value
+
+       return $tap_rv
 }
 
 require() {
-       note="$*"
-       program=$1
-       shift
-       $program "$@" > test.out 2>&1
+       tryrun "$@"
        rv=$?
-       tn=$((tn + 1))
        if [ $rv -ne 0 ]; then
-               printf 'not ok %d - %s %s\n' $tn $program "$*"
-               cat test.out | diagstdin
-               rm test.out
                bailout "exit status $rv";
        fi
-       printf 'ok %d - %s %s\n' $tn $program "$*"
-
 }
 
 bailout() {
@@ -70,7 +74,7 @@ failsok() {
        note=
        if [ $rv -eq 0 ]; then
                printf 'not ';
-               note=$(printf 'got "%d" expected "%d"' "$rv" "0")
+               note=$(printf 'got "%d" expected non-zero' "$rv")
        fi
        tn=$((tn + 1))
        printf 'ok %d - %s\n' $tn "$*"
@@ -95,7 +99,7 @@ okstreq() {
        note=
        if [ "$1" != "$2" ]; then
                printf 'not ';
-               note=$(printf 'got "%s" expected "%s"' "$1" "$2")
+               note=$(printf 'got "%s"\n# expected "%s"' "$1" "$2")
        fi
 
        shift;shift;
@@ -121,6 +125,26 @@ skip() {
        while [ $tap_skipping -gt 0 ]; do
                tn=$((tn + 1))
                tap_skipping=$((tap_skipping - 1))
-               printf 'ok %d - skip %s\n' $tn "$*"
+               printf 'ok %d - # skip %s\n' $tn "$*"
+               #ok '# skip ' "$*"
        done
 }
+
+ok() {
+       rv=$1
+       shift
+       if [ $rv = 1 ]; then
+               printf 'not '
+       fi
+       tn=$((tn + 1))
+       printf 'ok %d - %s\n' $tn "$*"
+       return $rv
+}
+
+pass() {
+       ok 0 "$@"
+}
+
+fail() {
+       ok 1 "$@"
+}