Regression test doesn't rely on value of O_NONBLOCK.

[adns.git] / regress / m1test

diff --git a/regress/m1test b/regress/m1test
index b70cde2d3b5f2d6317c6dfeefa5ff4dad3452ff5..81cd024fe6b6bc7e6fd2af7d95615b66aaa7af91 100755 (executable)
--- a/regress/m1test
+++ b/regress/m1test
@@ -1,7 +1,13 @@
 #!/bin/sh
-# usage: m1test <name> <initfile> <queryargs>
 
 set -e
+
+if [ $# -lt 3 ]
+then
+       echo >&2 'usage: m1test <name> <initfile> <queryargs>'
+       exit 1
+fi
+
 case="case-$1"; shift
 initfile="$1"; shift
 queryargs="$*"
@@ -13,17 +19,12 @@ echo "$queryargs" >>"$case.sys"
 
 echo running "hrecord /... $queryargs"
 set +e
-ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.stdout" 2>"$case.stderr" </dev/null \
+ADNS_TEST_OUT_FD=3 3>>"$case.sys" >"$case.out" 2>"$case.err" </dev/null \
  ./hrecord "/$initstring" $queryargs
 rc=$?
 set -e
 
-egrep . -- "$case.stderr" "$case.stdout"
-echo "exit status: $rc"
+echo "rc=$rc" >>$case.out
 
-if test $rc = 0
-then
-       echo "test created ok"
-fi
-
-exit $rc
+egrep . -- "$case.err" "$case.out"
+echo "exit status: $rc"