A couple more tests and a script to manage.

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 0c727a07e553757ec71052e8c022af2e62126285..0773e6205247f6a40d07a1493d5580c985fbeb5d 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,11 +2,39 @@
 # usage: r1test <testcasename>
 
 set -e
-tcn="$1"
-test -d ../testcases || cd testcases
+casename="$1"
+case="case-$casename"
 
-exec <$tcn.log
+exec <"$case.sys"
 read initfile
 read queryargs
-initstring="`cat $initfile.init`"
-../hplayback "/$initstring" $queryargs
+
+initstring="`cat init-$initfile.text`"
+
+set +e
+ADNS_TEST_REPORT_FD=3 3>>"$case.report-o" >"$case.stdout-o" 2>"$case.stderr-o" \
+ ./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
+
+for part in stdout stderr
+do
+       if diff -- "$case.$part" "$case.$part-o"
+       then
+               :
+       else
+               echo >&2 "FAILED $case - WRONG OUTPUT"
+               exit 2
+       fi
+done
+
+echo -n "$casename "
+
+exit 0