chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in changelog entry for 1.6.1
[adns.git]
/
regress
/
shlib
diff --git
a/regress/shlib
b/regress/shlib
index 3aadb9f652c961c44bff2f945af415fe73b0d6ab..eabe631bb3013abe9d643579b79449dc68308e3e 100644
(file)
--- a/
regress/shlib
+++ b/
regress/shlib
@@
-4,13
+4,20
@@
playback_prepare () {
case="$srcdir/case-$casename"
ocase="output-$casename"
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
initstring="`cat $srcdir/init-$initfile.text`"
xinitflagsf=$srcdir/$program-xinitflags.text
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
+ if test -
e
$xinitflagsf
then
initflags="$initflags `cat $xinitflagsf`";
else
then
initflags="$initflags `cat $xinitflagsf`";
else
@@
-20,6
+27,16
@@
playback_prepare () {
playback=./${program}_playback
}
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 () {
- playback_execute_c
allback
$initflags"$initstring" $queryargs
+ playback_execute_c
ore
$initflags"$initstring" $queryargs
}
}