have tap.sh require use tryrun

[zpackage] / t / tap.sh

diff --git a/t/tap.sh b/t/tap.sh
index 59df961a207547397e0719816096d61fe67f6de8..f881b1cdcc1a7d7865c0ad46c315dec8ba3b8cea 100755 (executable)
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -4,29 +4,34 @@ tn=0
 planned=0
 
 tryrun() {
-       note="$@"
        program=$1
        shift
-       $program "$@"
-       if [ $? -ne 0 ]; then
+       $program "$@" > test.out 2>&1
+       tap_return_value=$?
+       if [ $tap_return_value -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
+               rm test.out
+       fi
+       return $tap_return_value
 }
 
 require() {
-       note="$@"
-       program=$1
-       shift
-       $program "$@"
-       if [ $? -ne 0 ]; then
-               printf "bail out! fail[$?]: $@\n"
-               exit 255;
+       tryrun "$@"
+       rv=$?
+       if [ $rv -ne 0 ]; then
+               bailout "exit status $rv";
        fi
-       tn=$((tn + 1))
-       printf 'ok %d - %s %s\n' $tn $program "$*"
+}
 
+bailout() {
+       diag "$@"
+       printf "bail out!\n";
+       exit 255;
 }
 
 shownote() {
@@ -35,6 +40,18 @@ shownote() {
        fi
 }
 
+diag() {
+       printf '# %s\n' "$@"
+}
+
+diagfile() {
+       sed -e 's/^/# /' $1
+}
+
+diagstdin() {
+       sed -e 's/^/# /'
+}
+
 okexit() {
        exitwith 0 "$*"
 }
@@ -56,12 +73,13 @@ exitwith() {
        note=
        if [ $rv -ne $1 ]; then
                printf 'not ';
-               note=$(printf '# got "%d" expected "%d"' "$1" "$2")
+               note=$(printf 'got "%d" expected "%d"' "$rv" "$1")
        fi
        shift
        tn=$((tn + 1))
        printf 'ok %d - %s\n' $tn "$*"
        shownote
+       return $rv
 }
 
 okstreq() {
@@ -87,3 +105,13 @@ finish() {
                printf '1..%d\n' $tn
        fi
 }
+
+skip() {
+       tap_skipping=$1
+       shift
+       while [ $tap_skipping -gt 0 ]; do
+               tn=$((tn + 1))
+               tap_skipping=$((tap_skipping - 1))
+               printf 'ok %d - # skip %s\n' $tn "$*"
+       done
+}