add tests for more package installs

[zpackage] / t / tap.sh

diff --git a/t/tap.sh b/t/tap.sh
index 0d03831bcf03cbb41d63ba198d8ab1f0a96f61a5..00530027795577e8cd9d51c46b297e34461f5b4c 100755 (executable)
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -8,16 +8,16 @@ tryrun() {
        program=$1
        shift
        $program "$@" > test.out 2>&1
-       rv=$?
-       if [ $rv -ne 0 ]; then
+       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 [ $rv -ne 0 ]; then
+       if [ $tap_return_value -ne 0 ]; then
                cat test.out | diagstdin
        fi
-       return $rv
+       return $tap_return_value
 }
 
 require() {
@@ -88,6 +88,7 @@ exitwith() {
        tn=$((tn + 1))
        printf 'ok %d - %s\n' $tn "$*"
        shownote
+       return $rv
 }
 
 okstreq() {