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

diff --git a/regress/r1test b/regress/r1test
index a9ec3ce..3b2bfdf 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -20,24 +20,25 @@ ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
 rc=$?
 set -e
 
-if test $rc != 0
-then
-	egrep . -- "$ocase.report" "$ocase.out" "$ocase.err"
-	echo >&2 "FAILED $case - EXIT STATUS $rc"
-	exit 2
-fi
+echo "rc=$rc" >>$ocase.out
 
-for part in out err
+failed=false
+for part in err out
 do
-	if diff -- "$case.$part" "$ocase.$part"
+	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