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

diff --git a/t/tap.sh b/t/tap.sh
index 23c5299..580fcbd 100755
--- a/t/tap.sh
+++ b/t/tap.sh
@@ -7,7 +7,7 @@ tryrun() {
 	note="$@"
 	program=$1
 	shift
-	$program "$@"
+	$program "$@" >> test.out 2>&1
 	if [ $? -ne 0 ]; then
 		printf 'not ';
 	fi
@@ -15,21 +15,55 @@ tryrun() {
 	printf 'ok %d - %s %s\n' $tn $program "$*"
 }
 
+require() {
+	note="$*"
+	program=$1
+	shift
+	$program "$@" >> test.out 2>&1
+	rv=$?
+	tn=$((tn + 1))
+	if [ $rv -ne 0 ]; then
+		printf 'not ok %d - %s %s\n' $tn $program "$*"
+		bailout "exit status $rv";
+	fi
+	printf 'ok %d - %s %s\n' $tn $program "$*"
+
+}
+
+bailout() {
+	diag "$@"
+	printf "bail out!\n";
+	exit 255;
+}
+
 shownote() {
 	if [ "$note" != "" ]; then
 		printf '# %s\n' "$note"
 	fi
 }
 
+diag() {
+	printf '# %s\n' "$@"
+}
+
+diagfile() {
+	sed -e 's/^/# /' $1
+}
+
+diagstdin() {
+	sed -e 's/^/# /'
+}
+
 okexit() {
 	exitwith 0 "$*"
 }
 
 failsok() {
+	rv=$?
 	note=
-	if [ $? -eq 0 ]; then
+	if [ $rv -eq 0 ]; then
 		printf 'not ';
-		note=$(printf '# got "%d" expected "%d"' "$1" "0")
+		note=$(printf 'got "%d" expected "%d"' "$rv" "0")
 	fi
 	tn=$((tn + 1))
 	printf 'ok %d - %s\n' $tn "$*"
@@ -37,10 +71,11 @@ failsok() {
 }
 
 exitwith() {
+	rv=$?
 	note=
-	if [ $? -ne $1 ]; then
+	if [ $rv -ne $1 ]; then
 		printf 'not ';
-		note=$(printf '# got "%d" expected "%d"' "$1" "$2")
+		note=$(printf '# got "%d" expected "%d"' "$rv" "$1")
 	fi
 	shift
 	tn=$((tn + 1))