X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=regress%2Fshlib;h=eabe631bb3013abe9d643579b79449dc68308e3e;hb=HEAD;hp=3aadb9f652c961c44bff2f945af415fe73b0d6ab;hpb=fb3b3da3a0b6bf6d7d7f2a3ce182f368bf83de82;p=adns.git

diff --git a/regress/shlib b/regress/shlib
index 3aadb9f..eabe631 100644
--- a/regress/shlib
+++ b/regress/shlib
@@ -4,13 +4,20 @@ playback_prepare () {
 	case="$srcdir/case-$casename"
 	ocase="output-$casename"
 
+	if test -e "$case.in"
+	then
+		exec <"$case.in"
+	else
+		exec </dev/null
+	fi
+
 	exec 4<"$case.sys"
 	read <&4 program initfile initflags
 	read <&4 queryargs
 
 	initstring="`cat $srcdir/init-$initfile.text`"
 	xinitflagsf=$srcdir/$program-xinitflags.text
-	if test -f $xinitflagsf
+	if test -e $xinitflagsf
 	then
 		initflags="$initflags `cat $xinitflagsf`";
 	else
@@ -20,6 +27,16 @@ playback_prepare () {
 	playback=./${program}_playback
 }
 
+playback_execute_core () {
+	playback_execute_hook "$@"
+	set +e
+	ADNS_TEST_REPORT_FD=3 ADNS_TEST_IN_FD=4 \
+	 3>>"$ocase.report" 4<&4 >"$ocase.out" 2>"$ocase.err" \
+	 $ADNS_TEST_DEBUG $playback "$@"
+	rc=$?
+	set -e
+}
+
 playback_execute () {
-	playback_execute_callback $initflags"$initstring" $queryargs
+	playback_execute_core $initflags"$initstring" $queryargs
 }