X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fr1test;h=a15f07172de34ee2b523571d44c8656da325f1f8;hb=1c957fdadf0ab368ab1266fbd6a9ea8fbe3b271d;hp=0c727a07e553757ec71052e8c022af2e62126285;hpb=12c5b204145993a34b92ac2b7de5ebcebb6d2d15;p=adns.git

diff --git a/regress/r1test b/regress/r1test
index 0c727a0..a15f071 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,11 +2,38 @@
 # usage: r1test <testcasename>
 
 set -e
-tcn="$1"
-test -d ../testcases || cd testcases
+case="case-$1"
 
-exec <$tcn.log
+exec <"$case.sys"
 read initfile
 read queryargs
-initstring="`cat $initfile.init`"
-../hplayback "/$initstring" $queryargs
+
+initstring="`cat init-$initfile.text`"
+
+set +e
+ADNS_TEST_REPORT_FD=3 3>>"$case.report-o" >"$case.stdout-o" 2>"$case.stderr-o" \
+ ./hplayback "/$initstring" $queryargs
+rc=$?
+set -e
+
+if test $rc != 0
+then
+	egrep . -- "$case.report-o" "$case.stdout-o" "$case.stderr-o"
+	echo >&2 "FAILED $case - EXIT STATUS $rc"
+	exit 2
+fi
+
+for part in stdout stderr
+do
+	if diff -- "$case.$part" "$case.$part-o"
+	then
+		:
+	else
+		echo >&2 "FAILED $case - WRONG OUTPUT"
+		exit 2
+	fi
+done
+
+echo -n " $case "
+
+exit 0