X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fr1test;h=ce6b2831578cf5b934181745d488fec0ed0d888a;hb=78bcc1723e2e87c659bf63365e118245e53fd7e1;hp=a15f07172de34ee2b523571d44c8656da325f1f8;hpb=1c957fdadf0ab368ab1266fbd6a9ea8fbe3b271d;p=adns.git

diff --git a/regress/r1test b/regress/r1test
index a15f071..ce6b283 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,7 +2,9 @@
 # usage: r1test <testcasename>
 
 set -e
-case="case-$1"
+casename="$1"
+case="case-$casename"
+ocase="output-$casename"
 
 exec <"$case.sys"
 read initfile
@@ -10,22 +12,19 @@ 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
+for part in out err
 do
-	if diff -- "$case.$part" "$case.$part-o"
+	if diff -u -- "$case.$part" "$ocase.$part"
 	then
 		:
 	else
@@ -34,6 +33,6 @@ do
 	fi
 done
 
-echo -n " $case "
+echo -n "$casename "
 
 exit 0