integrate previous work

[zpackage] / t / tap.sh

diff --git a/t/tap.sh b/t/tap.sh
index b82f203f5f7628cbdaca6d46d46974a2431ba826..1811f5dde48aacbf9ed9945d9a15eb8596d40ba9 100755 (executable)
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -7,7 +7,7 @@ tryrun() {
        note="$@"
        program=$1
        shift
-       $program "$@"
+       $program "$@" >> test.out 2>&1
        if [ $? -ne 0 ]; then
                printf 'not ';
        fi
@@ -19,9 +19,11 @@ require() {
        note="$@"
        program=$1
        shift
-       $program "$@"
-       if [ $? -ne 0 ]; then
-               printf "bail out! fail[$?]: $@\n"
+       $program "$@" >> test.out 2>&1
+       rv=$?
+       if [ $rv -ne 0 ]; then
+               diag "bailing on $((tn + 1)) $program $*"
+               printf "bail out! fail[$rv]: $@\n"
                exit 255;
        fi
        tn=$((tn + 1))