X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Ftap.sh;h=00530027795577e8cd9d51c46b297e34461f5b4c;hb=c9b5db2d4b9c4691bbcc2c61a47c4fc279eb057b;hp=580fcbd2d02d6be9e0627a880af59dee46bd6ad8;hpb=837982b6e11a00d6416de2c25004f94ccc6b0d4a;p=zpackage

diff --git a/t/tap.sh b/t/tap.sh
index 580fcbd..0053002 100755
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -7,23 +7,30 @@ tryrun() {
 	note="$@"
 	program=$1
 	shift
-	$program "$@" >> test.out 2>&1
-	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
+	fi
+	return $tap_return_value
 }
 
 require() {
 	note="$*"
 	program=$1
 	shift
-	$program "$@" >> test.out 2>&1
+	$program "$@" > test.out 2>&1
 	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 "$*"
@@ -75,12 +82,13 @@ exitwith() {
 	note=
 	if [ $rv -ne $1 ]; then
 		printf 'not ';
-		note=$(printf '# got "%d" expected "%d"' "$rv" "$1")
+		note=$(printf 'got "%d" expected "%d"' "$rv" "$1")
 	fi
 	shift
 	tn=$((tn + 1))
 	printf 'ok %d - %s\n' $tn "$*"
 	shownote
+	return $rv
 }
 
 okstreq() {
@@ -106,3 +114,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
+}