X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/a444333658b72c7d3aeecf7c755f6d6260ea1095..f5097daa3c74505b83e759c82518ab8bb41ea38f:/regress/r1test

diff --git a/regress/r1test b/regress/r1test
index 0773e62..de8db69 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,39 +2,56 @@
 # usage: r1test <testcasename>
 
 set -e
+mrc=1
+trap 'exit $mrc' 0
+
 casename="$1"
 case="case-$casename"
+ocase="output-$casename"
 
 exec <"$case.sys"
-read initfile
+read initfile initflags
 read queryargs
 
 initstring="`cat init-$initfile.text`"
 
+rm -f $ocase.*
+
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
 set +e
-ADNS_TEST_REPORT_FD=3 3>>"$case.report-o" >"$case.stdout-o" 2>"$case.stderr-o" \
- ./hplayback "/$initstring" $queryargs
+ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
+ ./hplayback $initflags "/$initstring" $queryargs
 rc=$?
 set -e
 
-if test $rc != 0
+if [ "$rc" = 5 ]
 then
-	egrep . -- "$case.report-o" "$case.stdout-o" "$case.stderr-o"
-	echo >&2 "FAILED $case - EXIT STATUS $rc"
-	exit 2
+	echo -n "SKIPPED-$casename "
+	mrc=5
+	exit
 fi
 
-for part in stdout stderr
+echo "rc=$rc" >>$ocase.out
+
+failed=false
+for part in err out
 do
-	if diff -- "$case.$part" "$case.$part-o"
+	if diff -u -- "$case.$part" "$ocase.$part"
 	then
 		:
 	else
-		echo >&2 "FAILED $case - WRONG OUTPUT"
-		exit 2
+		failed=true
 	fi
 done
 
-echo -n "$casename "
+if $failed
+then
+	echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+	mrc=2
+	exit
+fi
 
-exit 0
+echo -n "$casename "
+mrc=0