X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fr1test;h=564efaca378a7c47622d5fdcb5e74efb97b994b6;hp=96d7195f46f83be5b4cca04be7bae40b8f84c767;hb=0d66e3739146c9349ceb7600adc814d7d968e14c;hpb=0ebff22d9b5832b18444f7c680ca71e24fc3734e

diff --git a/regress/r1test b/regress/r1test
index 96d7195..564efac 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -7,7 +7,7 @@
 #
 #  It is part of adns, which is
 #    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,15 +31,15 @@ casename="$1"
 case="case-$casename"
 ocase="output-$casename"
 
-exec <"$case.sys"
-read program 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)";
+	initflags="$initflags `cat $xinitflagsf`";
 else
 	initflags="$initflags /"
 fi
@@ -49,9 +49,25 @@ 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" \
- ./${program}_playback $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
 
@@ -75,7 +91,7 @@ do
 	fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
 	failwhy="$failwhy EXITED EARLY"