~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document a few more of tonight's changes.
[adns]
/
regress
/
m1test
diff --git
a/regress/m1test
b/regress/m1test
index
e88933e
..
dbd6bc5
100755
(executable)
--- a/
regress/m1test
+++ b/
regress/m1test
@@
-1,23
+1,38
@@
#!/bin/sh
#!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
set -e
set -e
+
+if [ $# -lt 3 ]
+then
+ echo >&2 'usage: m1test <name> <initfile> [<initflags>] <queryargs>'
+ exit 1
+fi
+
case="case-$1"; shift
initfile="$1"; shift
case="case-$1"; shift
initfile="$1"; shift
+
+case "$1" in
+-*) initflags="$1"; shift
+esac
+
queryargs="$*"
initstring="`cat init-$initfile.text`"
queryargs="$*"
initstring="`cat init-$initfile.text`"
-echo
"$initfile"
>"$case.sys"
+echo
$initfile $initflags
>"$case.sys"
echo "$queryargs" >>"$case.sys"
echo "$queryargs" >>"$case.sys"
-echo running "hrecord /... $queryargs"
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
+echo running hrecord $initflags "/... $queryargs"
set +e
set +e
-ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.
stdout" 2>"$case.std
err" </dev/null \
- ./hrecord "/$initstring" $queryargs
+ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.
out" 2>"$case.
err" </dev/null \
+ ./hrecord
$initflags
"/$initstring" $queryargs
rc=$?
set -e
rc=$?
set -e
-egrep . -- "$case.stderr" "$case.stdout"
+echo "rc=$rc" >>$case.out
+
+egrep . -- "$case.err" "$case.out"
echo "exit status: $rc"
echo "exit status: $rc"
-exit $rc