+ General Improvements:

[adns.git] / regress / r1test

diff --git a/regress/r1test b/regress/r1test
index 9215ad56f134cda1bebc90ed4732acfe0ba7bf0c..96d7195f46f83be5b4cca04be7bae40b8f84c767 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -32,10 +32,17 @@ case="case-$casename"
 ocase="output-$casename"
 
 exec <"$case.sys"
-read initfile initflags
+read program initfile initflags
 read queryargs
 
 initstring="`cat init-$initfile.text`"
+xinitflagsf=$program-xinitflags.text
+if test -f $xinitflagsf
+then
+       initflags="$initflags $(cat $xinitflagsf)";
+else
+       initflags="$initflags /"
+fi
 
 rm -f $ocase.*
 
@@ -44,13 +51,13 @@ export EF_DISABLE_BANNER
 
 set +e
 ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback $initflags "/$initstring" $queryargs
+ ./${program}_playback $initflags"$initstring" $queryargs
 rc=$?
 set -e
 
 if [ "$rc" = 5 ]
 then
-       echo -n "SKIPPED-$casename "
+       printf "SKIPPED-$casename "
        mrc=5
        exit
 fi
@@ -82,5 +89,5 @@ then
        exit
 fi
 
-echo -n "$casename "
+printf "$casename "
 mrc=0