regress: playback: Fold other Tensure calls into Tensuresetup

[adns.git] / regress / shlib

diff --git a/regress/shlib b/regress/shlib
index 3aadb9f652c961c44bff2f945af415fe73b0d6ab..6f855d5fd46251620bf1010989b3839f394c0939 100644 (file)
--- a/regress/shlib
+++ b/regress/shlib
@@ -10,7 +10,7 @@ playback_prepare () {
 
        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 +20,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
 }