chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ Core library bugfixes:
[adns.git]
/
regress
/
r1test
diff --git
a/regress/r1test
b/regress/r1test
index a15f07172de34ee2b523571d44c8656da325f1f8..de8db693792b16d66d7f659d0ec9b55d3e4c629f 100755
(executable)
--- a/
regress/r1test
+++ b/
regress/r1test
@@
-2,38
+2,56
@@
# usage: r1test <testcasename>
set -e
# usage: r1test <testcasename>
set -e
-case="case-$1"
+mrc=1
+trap 'exit $mrc' 0
+
+casename="$1"
+case="case-$casename"
+ocase="output-$casename"
exec <"$case.sys"
exec <"$case.sys"
-read initfile
+read initfile
initflags
read queryargs
initstring="`cat init-$initfile.text`"
read queryargs
initstring="`cat init-$initfile.text`"
+rm -f $ocase.*
+
+EF_DISABLE_BANNER=1
+export EF_DISABLE_BANNER
+
set +e
set +e
-ADNS_TEST_REPORT_FD=3 3>>"$
case.report-o" >"$case.stdout-o" 2>"$case.stderr-o
" \
- ./hplayback "/$initstring" $queryargs
+ADNS_TEST_REPORT_FD=3 3>>"$
ocase.report" >"$ocase.out" 2>"$ocase.err
" \
+ ./hplayback
$initflags
"/$initstring" $queryargs
rc=$?
set -e
rc=$?
set -e
-if
test $rc != 0
+if
[ "$rc" = 5 ]
then
then
- e
grep . -- "$case.report-o" "$case.stdout-o" "$case.stderr-o
"
- echo >&2 "FAILED $case - EXIT STATUS $rc"
- exit
2
+ e
cho -n "SKIPPED-$casename
"
+ mrc=5
+ exit
fi
fi
-for part in stdout stderr
+echo "rc=$rc" >>$ocase.out
+
+failed=false
+for part in err out
do
do
- if diff -
- "$case.$part" "$case.$part-o
"
+ 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 " $case "
+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