Better usage messages (and no default query domain) for adnstest.

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 0773e6205247f6a40d07a1493d5580c985fbeb5d..4d10101bed755283158c74da2f6bf0e5b473fd2a 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -4,37 +4,41 @@
 set -e
 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.*
+
 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
-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