chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
option debug and option ndots implemented
[adns.git]
/
regress
/
r1test
diff --git
a/regress/r1test
b/regress/r1test
index a15f07172de34ee2b523571d44c8656da325f1f8..ce6b2831578cf5b934181745d488fec0ed0d888a 100755
(executable)
--- a/
regress/r1test
+++ b/
regress/r1test
@@
-2,7
+2,9
@@
# usage: r1test <testcasename>
set -e
# usage: r1test <testcasename>
set -e
-case="case-$1"
+casename="$1"
+case="case-$casename"
+ocase="output-$casename"
exec <"$case.sys"
read initfile
exec <"$case.sys"
read initfile
@@
-10,22
+12,19
@@
read queryargs
initstring="`cat init-$initfile.text`"
initstring="`cat init-$initfile.text`"
+rm -f $ocase.*
+
set +e
set +e
-ADNS_TEST_REPORT_FD=3 3>>"$
case.report-o" >"$case.stdout-o" 2>"$case.stderr-o
" \
+ADNS_TEST_REPORT_FD=3 3>>"$
ocase.report" >"$ocase.out" 2>"$ocase.err
" \
./hplayback "/$initstring" $queryargs
rc=$?
set -e
./hplayback "/$initstring" $queryargs
rc=$?
set -e
-if test $rc != 0
-then
- egrep . -- "$case.report-o" "$case.stdout-o" "$case.stderr-o"
- echo >&2 "FAILED $case - EXIT STATUS $rc"
- exit 2
-fi
+echo "rc=$rc" >>$ocase.out
-for part in
stdout std
err
+for part in
out
err
do
do
- if diff -
- "$case.$part" "$case.$part-o
"
+ if diff -
u -- "$case.$part" "$ocase.$part
"
then
:
else
then
:
else
@@
-34,6
+33,6
@@
do
fi
done
fi
done
-echo -n "
$cas
e "
+echo -n "
$casenam
e "
exit 0
exit 0