X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/89435c4293f285ceb0a54d14ae68e2bb40ba4c67..d024926c5dbb8f65d368f1c7ada258a4b29d0d0c:/regress/r1test

diff --git a/regress/r1test b/regress/r1test
index 9215ad5..a325600 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -31,26 +31,41 @@ casename="$1"
 case="case-$casename"
 ocase="output-$casename"
 
-exec <"$case.sys"
-read initfile initflags
-read queryargs
+exec 4<"$case.sys"
+read <&4 program initfile initflags
+read <&4 queryargs
 
 initstring="`cat init-$initfile.text`"
+xinitflagsf=$program-xinitflags.text
+if test -f $xinitflagsf
+then
+	initflags="$initflags $(cat $xinitflagsf)";
+else
+	initflags="$initflags /"
+fi
 
 rm -f $ocase.*
 
 EF_DISABLE_BANNER=1
 export EF_DISABLE_BANNER
 
+if test -f "$case.in"
+then
+	exec <"$case.in"
+else
+	exec </dev/null
+fi
+
 set +e
 ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback $initflags "/$initstring" $queryargs
+ADNS_TEST_IN_FD=4 \
+ ./${program}_playback $initflags"$initstring" $queryargs
 rc=$?
 set -e
 
 if [ "$rc" = 5 ]
 then
-	echo -n "SKIPPED-$casename "
+	printf "SKIPPED-$casename "
 	mrc=5
 	exit
 fi
@@ -82,5 +97,5 @@ then
 	exit
 fi
 
-echo -n "$casename "
+printf "$casename "
 mrc=0