From: Mark Andrews <marka@isc.org>
Date: Wed, 4 Mar 2015 04:51:31 +0000 (+1100)
Subject: handle daylight savings changes
X-Git-Tag: v9.11.0a1~934
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2e0d8d74d7a3163f3cf55e46ff0e14317bd7b8af;p=thirdparty%2Fbind9.git

handle daylight savings changes
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 3dfc0457d2a..154dcfe6bcf 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -2049,8 +2049,8 @@ then
     d=`$PERL ./ntadiff.pl "$ts_with_zone" "$added"`
     echo "d=$d" >> rndc.out.ns4.test$n.2
     # diff from $added(now) + 1week to the clamped NTA lifetime should be
-    # less than a few seconds.
-    [ $d -lt 10 ] || ret=1
+    # less than a few seconds (handle daylight saving changes by adding 3600).
+    [ $d -lt 3610 ] || ret=1
 else
     echo "I: skipped ntadiff test; install PERL module Time::Piece"
 fi
@@ -2075,6 +2075,7 @@ else
     echo "I:The DNSSEC update test requires the Net::DNS library." >&2
 fi
 
+n=`expr $n + 1`
 echo "I:checking managed key maintenance has not started yet ($n)"
 ret=0
 [ -f "ns4/managed-keys.bind.jnl" ] && ret=1