~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explain adns_processany better.
[adns]
/
regress
/
r1test
diff --git
a/regress/r1test
b/regress/r1test
index
a9ec3ce
..
142ef19
100755
(executable)
--- a/
regress/r1test
+++ b/
regress/r1test
@@
-2,12
+2,15
@@
# usage: r1test <testcasename>
set -e
# usage: r1test <testcasename>
set -e
+mrc=1
+trap 'exit $mrc' 0
+
casename="$1"
case="case-$casename"
ocase="output-$casename"
exec <"$case.sys"
casename="$1"
case="case-$casename"
ocase="output-$casename"
exec <"$case.sys"
-read initfile
+read initfile
initflags
read queryargs
initstring="`cat init-$initfile.text`"
read queryargs
initstring="`cat init-$initfile.text`"
@@
-16,28
+19,36
@@
rm -f $ocase.*
set +e
ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
set +e
ADNS_TEST_REPORT_FD=3 3>>"$ocase.report" >"$ocase.out" 2>"$ocase.err" \
- ./hplayback "/$initstring" $queryargs
+ ./hplayback
$initflags
"/$initstring" $queryargs
rc=$?
set -e
rc=$?
set -e
-if
test $rc != 0
+if
[ "$rc" = 5 ]
then
then
- e
grep . -- "$ocase.report" "$ocase.out" "$ocase.err
"
- echo >&2 "FAILED $case - EXIT STATUS $rc"
- exit
2
+ e
cho -n "SKIPPED-$casename
"
+ mrc=5
+ exit
fi
fi
-for part in out err
+echo "rc=$rc" >>$ocase.out
+
+failed=false
+for part in err out
do
do
- if diff -- "$case.$part" "$ocase.$part"
+ if diff -
u -
- "$case.$part" "$ocase.$part"
then
:
else
then
:
else
- echo >&2 "FAILED $case - WRONG OUTPUT"
- exit 2
+ failed=true
fi
done
fi
done
-echo -n "$casename "
+if $failed
+then
+ echo >&2 "FAILED $case - WRONG OUTPUT - lines of syscall remaining `wc -l`"
+ mrc=2
+ exit
+fi
-exit 0
+echo -n "$casename "
+mrc=0