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

diff --git a/regress/shlib b/regress/shlib
index c8d3fcc..eabe631 100644
--- a/regress/shlib
+++ b/regress/shlib
@@ -4,6 +4,13 @@ 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
@@ -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
 }