Merge branch '3437-cds-error-window-too-small' into 'main'

Resolve "CDS error window too small"

Closes #3437

See merge request isc-projects/bind9!6521
This commit is contained in:
Mark Andrews 2022-07-05 13:07:29 +00:00
commit 0b05ee34f0
2 changed files with 5 additions and 5 deletions

View file

@ -24,4 +24,4 @@ while (<>) {
die "missing notbefore time" unless $notbefore;
die "missing inception time" unless $inception;
my $delta = $inception - $notbefore;
die "bad inception time $delta" unless abs($delta - $target) <= 3;
die "bad inception time $delta" unless abs($delta - $target) <= 10;

View file

@ -17,7 +17,7 @@ status=0
n=0
fail() {
echo_i "failed"
status=`expr $status + 1`
status=$((status + 1))
}
runcmd() {
@ -26,11 +26,11 @@ runcmd() {
}
testcase() {
n=`expr $n + 1`
n=$((n + 1))
echo_i "$name ($n)"
expect=$1
shift
result=`runcmd "$@"`
result=$(runcmd "$@")
check_stdout
check_stderr
if [ "$expect" -ne "$result" ]; then
@ -43,10 +43,10 @@ testcase() {
check_stderr() {
if [ -n "${err:=}" ]; then
egrep "$err" err.$n >/dev/null && return 0
echo_d "stderr did not match '$err'"
else
[ -s err.$n ] || return 0
fi
echo_d "stderr did not match '$err'"
cat err.$n | cat_d
fail
}