regress: Break out some functions from r1test into a new file

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 1d5aca8e5854491154ba9ff2e125820020badcf6..74d7df2a9ce35b3ce63f319633d2a86f69141911 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -3,14 +3,15 @@
 # test execution script, for running one test
 #
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+#    Copyright (C) 2014  Mark Wooding
 #    Copyright (C) 1999-2000,2003,2006  Tony Finch
 #    Copyright (C) 1991 Massachusetts Institute of Technology
 #  (See the file INSTALL for full details.)
 #  
 #  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
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
@@ -19,56 +20,46 @@
 #  GNU General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+#  along with this program; if not, write to the Free Software Foundation.
 
 set -e
+: ${srcdir=.}
+. "$srcdir"/shlib
 mrc=1
 trap 'exit $mrc' 0
 
 casename="$1"
-case="case-$casename"
-ocase="output-$casename"
 
-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`";
-else
-       initflags="$initflags /"
-fi
+playback_prepare
 
 rm -f $ocase.*
 
 EF_DISABLE_BANNER=1
 export EF_DISABLE_BANNER
 
-if test -f "$case.in"
+if test -e "$case.in"
 then
        exec <"$case.in"
 else
        exec </dev/null
 fi
 
-playback=./${program}_playback
-if test ! -f $playback
+if test ! -e $playback
 then
        printf "SKIPPED-$casename "
        mrc=5
        exit
 fi
 
-set +e
-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
+playback_execute_callback () {
+       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
 
 if [ "$rc" = 5 ]
 then