X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fr1test;h=47b94b66c7307678800a2db0d5c727eb253948e7;hb=8e26a9718543603f9fa673fa942ab15c958f83a0;hp=a325600830ed437fdb8ac1b6a6ffcc71b93080a1;hpb=67a57aae0e981c235a2cb8d27214a3d4213ff941;p=adns.git

diff --git a/regress/r1test b/regress/r1test
index a325600..47b94b6 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -39,7 +39,7 @@ 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
@@ -56,10 +56,18 @@ 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" \
-ADNS_TEST_IN_FD=4 \
- ./${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
 
@@ -83,7 +91,7 @@ do
 	fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
 	failwhy="$failwhy EXITED EARLY"