X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fr1test;h=3b2bfdf15125a7d8f649228f22d582cd283da481;hb=9da4a044c4d2e0a960cf8f33c62774db02f4402d;hp=0773e6205247f6a40d07a1493d5580c985fbeb5d;hpb=39196d5f5abd0559b60ea2dcdaa6f37dde9d9fd9;p=adns.git

diff --git a/regress/r1test b/regress/r1test
index 0773e62..3b2bfdf 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -4,6 +4,7 @@
 set -e
 casename="$1"
 case="case-$casename"
+ocase="output-$casename"
 
 exec <"$case.sys"
 read initfile
@@ -11,30 +12,33 @@ read queryargs
 
 initstring="`cat init-$initfile.text`"
 
+rm -f $ocase.*
+
 set +e
-ADNS_TEST_REPORT_FD=3 3>>"$case.report-o" >"$case.stdout-o" 2>"$case.stderr-o" \
+ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
  ./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
+echo "rc=$rc" >>$ocase.out
 
-for part in stdout stderr
+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
 
+if $failed
+then
+	echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+	exit 2
+fi
+
 echo -n "$casename "
 
 exit 0