X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Ftap.sh;fp=t%2Ftap.sh;h=f881b1cdcc1a7d7865c0ad46c315dec8ba3b8cea;hb=9d52e76ca7992bf2f38868dbcf9c84a7cc1484c9;hp=162a4eb0dc670a7d7f3d81aa02201ce0f5a9e89c;hpb=cabe4437cdb5b40b55397608d0199ce31b0f3155;p=zpackage

diff --git a/t/tap.sh b/t/tap.sh
index 162a4eb..f881b1c 100755
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -4,7 +4,6 @@ tn=0
 planned=0
 
 tryrun() {
-	note="$@"
 	program=$1
 	shift
 	$program "$@" > test.out 2>&1
@@ -16,25 +15,17 @@ tryrun() {
 	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 "$@" > 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() {