X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Ftap.sh;h=c9fe8788b52694a69da2768638c4537c4018a1c5;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hp=162a4eb0dc670a7d7f3d81aa02201ce0f5a9e89c;hpb=ef7f8cbdc486e746bc23b0b131b106b6422c8fef;p=zpackage diff --git a/t/tap.sh b/t/tap.sh index 162a4eb..c9fe878 100755 --- 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() { @@ -122,5 +126,25 @@ skip() { tn=$((tn + 1)) tap_skipping=$((tap_skipping - 1)) 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 "$@" +}