X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fr1test;h=74d7df2a9ce35b3ce63f319633d2a86f69141911;hb=fb3b3da3a0b6bf6d7d7f2a3ce182f368bf83de82;hp=d1607824bf702c503347c203d7741c804fd86fa5;hpb=17cd4f48f8aee24c988b662b95884d50b6395584;p=adns.git

diff --git a/regress/r1test b/regress/r1test
index d160782..74d7df2 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -3,7 +3,7 @@
 # test execution script, for running one test
 #
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014  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
@@ -24,52 +24,42 @@
 
 set -e
 : ${srcdir=.}
+. "$srcdir"/shlib
 mrc=1
 trap 'exit $mrc' 0
 
 casename="$1"
-case="$srcdir/case-$casename"
-ocase="output-$casename"
 
-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
-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" \
- $ADNS_TEST_DEBUG $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