Fix resolver system test on system without ipv6 (--disable-ipv6).

diff --git a/CHANGES b/CHANGES
index a2b6f7475360314e24d9876bef6a3374b3c53fb6..1f800de914b32096417a59926668b42c54a73ac2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5433.  [test]          Resolver system test for change #5395
+                       (max-recursion-queries) failed on system without
+                       IPv6 suport. [GL #1873]
+
 5428.  [bug]           Cleanup GSSAPI resources in nsupdate only after taskmgr
                        has been destroyed. Thanks to Petr Menšík. [GL !3316]
 

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index f2a3103ad1cd1f2bd8c3edc57be00c5b391be4f6..46014b83cb1b520f03adacce4a95bb6ba5b8a177 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -263,6 +263,7 @@ do
         # Expected queries = 2 * number of NS records, up to a maximum of 10.
         expected=`expr 2 \* $nscount`
         if [ $expected -gt 10 ]; then expected=10; fi
+        if ! testsock6; then expected=`expr $expected / 2`; fi
         # Work out the queries made by checking statistics on the target before and after the test
         $RNDCCMD 10.53.0.6 stats || ret=1
         initial_count=`awk '/responses sent/ {print $1}' ns6/named.stats`