X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Ftap.sh;h=162a4eb0dc670a7d7f3d81aa02201ce0f5a9e89c;hb=ef7f8cbdc486e746bc23b0b131b106b6422c8fef;hp=0d03831bcf03cbb41d63ba198d8ab1f0a96f61a5;hpb=4f60c538ec7111597176984e32d3996e4b5adb17;p=zpackage

diff --git a/t/tap.sh b/t/tap.sh
index 0d03831..162a4eb 100755
--- 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() {
@@ -120,6 +121,6 @@ skip() {
 	while [ $tap_skipping -gt 0 ]; do
 		tn=$((tn + 1))
 		tap_skipping=$((tap_skipping - 1))
-		printf 'ok %d - skip %s\n' $tn "$*"
+		printf 'ok %d - # skip %s\n' $tn "$*"
 	done
 }