diff options
author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-17 16:51:45 +0000 |
---|---|---|
committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-17 16:51:45 +0000 |
commit | f3d7df6c6b103bd096bfc455e88d79c8f6c3195b (patch) | |
tree | d30c44e4a5498b4e1c966c1f038dd9ec4fe9307c /test | |
parent | d114ec46542ba09900db6dd2005adaecb7a8198d (diff) |
Fix address sorting untidiness for the test suite.
Diffstat (limited to 'test')
-rw-r--r-- | test/confs/0366 | 1 | ||||
-rw-r--r-- | test/confs/0455 | 1 | ||||
-rw-r--r-- | test/confs/0499 | 1 | ||||
-rwxr-xr-x | test/runtest | 6 | ||||
-rw-r--r-- | test/stderr/0499 | 1 | ||||
-rw-r--r-- | test/stdout/0467 | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/test/confs/0366 b/test/confs/0366 index 62fdda1cb..930b6467d 100644 --- a/test/confs/0366 +++ b/test/confs/0366 @@ -14,6 +14,7 @@ gecos_name = CALLER_NAME ignore_bounce_errors_after = 0s qualify_domain = test.ex +disable_ipv6 # ----- Routers ----- diff --git a/test/confs/0455 b/test/confs/0455 index eb6982fd6..14e4161f2 100644 --- a/test/confs/0455 +++ b/test/confs/0455 @@ -16,6 +16,7 @@ acl_not_smtp = non ignore_bounce_errors_after = 0s qualify_domain = test.ex +disable_ipv6 # ----- ACLs ----- diff --git a/test/confs/0499 b/test/confs/0499 index 18364b7cf..ada9e8aa5 100644 --- a/test/confs/0499 +++ b/test/confs/0499 @@ -12,6 +12,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- domainlist anymx = @mx_any +disable_ipv6 # ----- Routers ----- diff --git a/test/runtest b/test/runtest index 699030bda..76cc4b99b 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.5 2006/02/16 14:34:42 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.6 2006/03/17 16:51:45 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -648,9 +648,11 @@ while(<IN>) if ($is_stdout) { - # Skip translate_ip_address in -bP output because it ain't always there + # Skip translate_ip_address and use_classresources in -bP output because + # they aren't always there. next if /translate_ip_address =/; + next if /use_classresources/; # In certain filter tests, remove initial filter lines because they just # clog up by repetition. diff --git a/test/stderr/0499 b/test/stderr/0499 index 47a8229c7..13b4d4f0f 100644 --- a/test/stderr/0499 +++ b/test/stderr/0499 @@ -27,7 +27,6 @@ mxt1.test.ex in "+anymx"? yes (matched "+anymx") checking "condition" DNS lookup of mxt1.test.ex (MX) using fakens DNS lookup of mxt1.test.ex (MX) succeeded -DNS lookup of eximtesthost.test.ex-AAAA: using cached value DNS_NODATA DNS lookup of eximtesthost.test.ex (A) using fakens DNS lookup of eximtesthost.test.ex (A) succeeded local host has lowest MX diff --git a/test/stdout/0467 b/test/stdout/0467 index 60ffdae03..d9c20263c 100644 --- a/test/stdout/0467 +++ b/test/stdout/0467 @@ -5,8 +5,8 @@ x@srv01.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25 x@mx246.test.ex router = r1, transport = t1 - host v6.test.ex [unknown] MX=10 ** unusable ** host ten-1.test.ex [V4NET.0.0.1] MX=10 + host v6.test.ex [unknown] MX=10 ** unusable ** x@srv02.test.ex router = r1, transport = t1 host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99 |