X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/e3324da100d2e5ed492367ffaef1890b86d3a302..296f1552a0ec3add0e483257738338a3db911f77:/regress/r1test?ds=sidebyside

diff --git a/regress/r1test b/regress/r1test
index 0c727a0..3b2bfdf 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,11 +2,43 @@
 # usage: r1test <testcasename>
 
 set -e
-tcn="$1"
-test -d ../testcases || cd testcases
+casename="$1"
+case="case-$casename"
+ocase="output-$casename"
 
-exec <$tcn.log
+exec <"$case.sys"
 read initfile
 read queryargs
-initstring="`cat $initfile.init`"
-../hplayback "/$initstring" $queryargs
+
+initstring="`cat init-$initfile.text`"
+
+rm -f $ocase.*
+
+set +e
+ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
+ ./hplayback "/$initstring" $queryargs
+rc=$?
+set -e
+
+echo "rc=$rc" >>$ocase.out
+
+failed=false
+for part in err out
+do
+	if diff -u -- "$case.$part" "$ocase.$part"
+	then
+		:
+	else
+		failed=true
+	fi
+done
+
+if $failed
+then
+	echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+	exit 2
+fi
+
+echo -n "$casename "
+
+exit 0