Testsuite: fix non-ipv6 platforms

Broken-by: 7d8d08c484

diff --git a/test/runtest b/test/runtest
index 8f6bd28b8b35e8079cb610628a2f1b706e1cd243..1df7fc718f55dc609331d74343c44f477e18b530 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1093,6 +1093,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
     next if /DNS lookup of \S+ \(AAAA\) using fakens/;
     next if / in dns_ipv4_lookup?/;
+    next if / writing neg-cache entry for .*AAAA/;
 
     if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
       {

diff --git a/test/stderr/0002 b/test/stderr/0002
index f0b7776f7770ab65c701424f58a5cae4f4d00415..8f85e71460704dbc1d655aaedf4a13e25ef07b48 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -298,7 +298,6 @@ looking up host name for V4NET.0.0.1
 DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "ten-1.test.ex"
- writing neg-cache entry for ten-1.test.ex-AAAA-41, ttl 3600
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 

diff --git a/test/stderr/0094 b/test/stderr/0094
index b59d608fce56e751ff1ecf0dc541646c6448948a..26cf9160525e6be7a5fa3219b05b2bbbe5e820e3 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -83,14 +83,12 @@ DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "oneback.test.ex"
   alias "host1.masq.test.ex"
- writing neg-cache entry for oneback.test.ex-AAAA-41, ttl 3600
 DNS lookup of oneback.test.ex (A) using fakens
 DNS lookup of oneback.test.ex (A) succeeded
 oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
 checking addresses for oneback.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.90 OK
- writing neg-cache entry for host1.masq.test.ex-AAAA-41, ttl 3600
 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
 host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 

diff --git a/test/stderr/0278 b/test/stderr/0278
index 6e2fa3558f5536c7b390d1dc9864f305c71460b2..ae86f8ca40184c79c3d68f13a0c624c60fe90976 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -292,7 +292,6 @@ DNS lookup of test.ex (MX) using fakens
 DNS lookup of test.ex (MX) gave NO_DATA
 returning DNS_NODATA
  writing neg-cache entry for test.ex-MX-c1, ttl 3600
- writing neg-cache entry for test.ex-AAAA-c1, ttl 3600
 DNS lookup of test.ex (A) using fakens
 DNS lookup of test.ex (A) gave NO_DATA
 returning DNS_NODATA

diff --git a/test/stderr/0361 b/test/stderr/0361
index 8846bea0f4a3febd8febb85a14c93293de8cd62e..81d9778c8b139acc85dc31d0a9ad478aaba88fc7 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -105,7 +105,6 @@ DNS lookup of recurse.test.ex.test.ex (MX) using fakens
 DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
  writing neg-cache entry for recurse.test.ex.test.ex-MX-c1, ttl 3600
- writing neg-cache entry for recurse.test.ex.test.ex-AAAA-c1, ttl 3600
 DNS lookup of recurse.test.ex.test.ex (A) using fakens
 DNS lookup of recurse.test.ex.test.ex (A) succeeded
 fully qualified name = recurse.test.ex.test.ex

diff --git a/test/stderr/0381 b/test/stderr/0381
index 62a0137531e37d34b24a3c94156b47c46bae7911..42b52d031e9d79aaf3ad6b43ceea55638a61d222 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -41,14 +41,12 @@ DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "x.gov.uk.test.ex"
   alias "x.co.uk.test.ex"
- writing neg-cache entry for x.gov.uk.test.ex-AAAA-41, ttl 3600
 DNS lookup of x.gov.uk.test.ex (A) using fakens
 DNS lookup of x.gov.uk.test.ex (A) succeeded
 x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
 checking addresses for x.gov.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
- writing neg-cache entry for x.co.uk.test.ex-AAAA-41, ttl 3600
 DNS lookup of x.co.uk.test.ex (A) using fakens
 DNS lookup of x.co.uk.test.ex (A) succeeded
 x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 

diff --git a/test/stderr/0419 b/test/stderr/0419
index 636015b10d2e05b5ba4e64aed113392ed91a56e0..8aba8f1e48ba6695f219da3c17c98efeb55fe316 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,10 +24,8 @@ dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
 DNS lookup of mxt13.test.ex (MX) using fakens
 DNS lookup of mxt13.test.ex (MX) succeeded
- writing neg-cache entry for other1.test.ex-AAAA-41, ttl 3600
 DNS lookup of other1.test.ex (A) using fakens
 DNS lookup of other1.test.ex (A) succeeded
- writing neg-cache entry for other2.test.ex-AAAA-41, ttl 3600
 DNS lookup of other2.test.ex (A) using fakens
 DNS lookup of other2.test.ex (A) succeeded
 other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")

diff --git a/test/stderr/0463 b/test/stderr/0463
index 694d9df8bf536d4bd573db99ee0e65cc9927259b..48b2d4bf826f51490f19854c2d85265d91bf16b5 100644 (file)
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -29,7 +29,6 @@ DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
  writing neg-cache entry for ten-1-MX-c1, ttl 3600
- writing neg-cache entry for ten-1-AAAA-c1, ttl 3600
 DNS lookup of ten-1 (A) using fakens
 DNS lookup of ten-1 (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -57,7 +56,6 @@ DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
  writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
- writing neg-cache entry for ten-1.test.ex-AAAA-c1, ttl 3600
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex

diff --git a/test/stderr/4802 b/test/stderr/4802
index 8f25c05f93122f6251d902ce35b189c7bd930d61..9575f881f4773a45f17404c5e22e9ca5abbe8cc4 100644 (file)
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -4,7 +4,6 @@ admin user
 dropping to exim gid; retaining priv uid
 DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
 DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
- writing neg-cache entry for a-aa.test.ex-AAAA-800041, ttl 3600
 DNS lookup of a-aa.test.ex (A) using fakens
 DNS lookup of a-aa.test.ex (A) succeeded
 DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
@@ -16,7 +15,6 @@ dropping to exim gid; retaining priv uid
 DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
 DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
 DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
- writing neg-cache entry for a-sec.test.ex-AAAA-800041, ttl 3600
 DNS lookup of a-sec.test.ex (A) using fakens
 DNS lookup of a-sec.test.ex (A) succeeded
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/4803 b/test/stderr/4803
index dd4d99f0c6202656b9b9dd1222e2fba624b14c5d..a7aa7bfa8f75622a485d6b7fddc8413ba8fafe6d 100644 (file)
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -4,7 +4,6 @@ admin user
 dropping to exim gid; retaining priv uid
 DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
 DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
- writing neg-cache entry for a-aa.test.ex-AAAA-800041, ttl 3600
 DNS lookup of a-aa.test.ex (A) using fakens
 DNS lookup of a-aa.test.ex (A) succeeded
 DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
@@ -20,7 +19,6 @@ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
 DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
 DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
 DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
- writing neg-cache entry for a-sec.test.ex-AAAA-800041, ttl 3600
 DNS lookup of a-sec.test.ex (A) using fakens
 DNS lookup of a-sec.test.ex (A) succeeded
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>