regress: Move case-*.in opening to shlib playback_prepare

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 4315bf8a77699f65b51400b6bf63f2e6101d2745..7d5a4d8b9a00f3d292e55880453ed6af55f03a01 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -1,34 +1,55 @@
 #!/bin/sh
 # usage: r1test <testcasename>
+# test execution script, for running one test
+#
+#  This file is part of adns, which is
+#    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 3, or (at your option)
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  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.
 
 set -e
+: ${srcdir=.}
+. "$srcdir"/shlib
 mrc=1
 trap 'exit $mrc' 0
 
 casename="$1"
-case="case-$casename"
-ocase="output-$casename"
 
-exec <"$case.sys"
-read initfile initflags
-read queryargs
-
-initstring="`cat init-$initfile.text`"
+playback_prepare
 
 rm -f $ocase.*
 
 EF_DISABLE_BANNER=1
 export EF_DISABLE_BANNER
 
-set +e
-ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback $initflags "/$initstring" $queryargs
-rc=$?
-set -e
+if test ! -e $playback
+then
+       printf "SKIPPED-$casename "
+       mrc=5
+       exit
+fi
+
+playback_execute_hook () { :; }
+playback_execute
 
 if [ "$rc" = 5 ]
 then
-       echo -n "SKIPPED-$casename "
+       printf "SKIPPED-$casename "
        mrc=5
        exit
 fi
@@ -46,7 +67,7 @@ do
        fi
 done
 
-cat >"$ocase.leftover"
+cat <&4 >"$ocase.leftover"
 if egrep . /dev/null "$ocase.leftover"
 then
        failwhy="$failwhy EXITED EARLY"
@@ -60,5 +81,5 @@ then
        exit
 fi
 
-echo -n "$casename "
+printf "$casename "
 mrc=0