[master] fix test errors

- require 5.006_001
- cut off the least significant figures of rrsig dates before
  comparison to avoid integer overflow

diff --git a/bin/tests/system/formerr/formerr.pl b/bin/tests/system/formerr/formerr.pl
index 9a2d237b1d9a35d9a4a4e6ee3f492a8fad653006..2eb609090cac61e79c9cfd5382d1852b93fa1a96 100644 (file)
--- a/bin/tests/system/formerr/formerr.pl
+++ b/bin/tests/system/formerr/formerr.pl
@@ -45,7 +45,7 @@
 #
 # XXX: Doesn't support IPv6 yet
 
-require 5.006.001;
+require 5.006_001;
 
 use strict;
 use Getopt::Std;

diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index 2b51e379aeb6523ffe21c7dc0674ad64e500be1f..041bb411bf3639db0616011534a2511b3729db37 100644 (file)
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -314,10 +314,13 @@ status=`expr $status + $ret`
 
 echo "I:checking RRSIG expiry date correctness"
 dnskey_expiry=`$CHECKZONE -o - $czone $cfile.signed 2> /dev/null |
-              awk '$4 == "RRSIG" && $5 == "DNSKEY" {print $9; exit}'`
+              awk '$4 == "RRSIG" && $5 == "DNSKEY" {print $9; exit}' |
+              cut -c1-10`
 soa_expiry=`$CHECKZONE -o - $czone $cfile.signed 2> /dev/null |
-           awk '$4 == "RRSIG" && $5 == "SOA" {print $9; exit}'`
+           awk '$4 == "RRSIG" && $5 == "SOA" {print $9; exit}' |
+           cut -c1-10`
 [ $dnskey_expiry -gt $soa_expiry ] || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 echo "I:waiting 30 seconds for key activation"