X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fr1test;h=0a5f9b2fe8e82d91dae0d841bd54d8b5f8bbddfa;hp=9215ad56f134cda1bebc90ed4732acfe0ba7bf0c;hb=e16c09ea29b6cb09b1f9a098aaed65da5fa4501a;hpb=3d5cde09d167be1609d27d0d93de2096250a310c

diff --git a/regress/r1test b/regress/r1test
index 9215ad5..0a5f9b2 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -31,26 +31,49 @@ 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
+
+playback=./${program}_playback
+if test ! -f $playback
+then
+	printf "SKIPPED-$casename "
+	mrc=5
+	exit
+fi
+
 set +e
-ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback $initflags "/$initstring" $queryargs
+ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+ 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
+ $playback $initflags"$initstring" $queryargs
 rc=$?
 set -e
 
 if [ "$rc" = 5 ]
 then
-	echo -n "SKIPPED-$casename "
+	printf "SKIPPED-$casename "
 	mrc=5
 	exit
 fi
@@ -68,7 +91,7 @@ do
 	fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
 	failwhy="$failwhy EXITED EARLY"
@@ -82,5 +105,5 @@ then
 	exit
 fi
 
-echo -n "$casename "
+printf "$casename "
 mrc=0