diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/1009 | 13 | ||||
| -rw-r--r-- | test/scripts/1000-Basic-ipv6/1009 | 24 | ||||
| -rw-r--r-- | test/src/locate.pl | 1 | ||||
| -rw-r--r-- | test/stdout/1009 | 21 |
4 files changed, 59 insertions, 0 deletions
diff --git a/test/confs/1009 b/test/confs/1009 index af6e27642..fbfa7f0c1 100644 --- a/test/confs/1009 +++ b/test/confs/1009 @@ -1,5 +1,7 @@ # Exim test configuration 1009 +OPT= + .include DIR/aux-var/std_conf_prefix @@ -12,10 +14,21 @@ queue_run_in_order begin routers +.ifdef ROUTE_DATA +r0: + driver = manualroute + route_data = ROUTE_DATA OPT + transport = t1 + self = send + +.else + r1: driver = dnslookup transport = t1 self = send + OPT +.endif # ----- Transports ----- diff --git a/test/scripts/1000-Basic-ipv6/1009 b/test/scripts/1000-Basic-ipv6/1009 index 6e5ae7d95..aea8a126e 100644 --- a/test/scripts/1000-Basic-ipv6/1009 +++ b/test/scripts/1000-Basic-ipv6/1009 @@ -11,3 +11,27 @@ exim -bt x@mx46466.test.ex **** exim -bt x@mx46466b.test.ex **** +# +# Reverse the preference order (dnslookup router) +exim -bt -DOPT=ipv4_prefer=y x@mx46.test.ex +**** +# +# Only lookup ipv4 (dnslookup router) +exim -bt -DOPT=ipv4_only=y x@mx46.test.ex +**** +# +# Reverse the preference order (manualroute router, MX) +exim -bt -DROUTE_DATA=mx46.test.ex/MX -DOPT=ipv4_prefer x@mx46.test.ex +**** +# +# Only lookup ipv4 (manualroute router, MX) +exim -bt -DROUTE_DATA=mx46.test.ex/MX -DOPT=ipv4_only x@mx46.test.ex +**** +# +# Reverse the preference order (manualroute router, plain) +exim -bt -DROUTE_DATA=46.test.ex -DOPT=ipv4_prefer x@mx46.test.ex +**** +# +# Only lookup ipv4 (manualroute router, plain) +exim -bt -DROUTE_DATA=46.test.ex -DOPT=ipv4_only x@mx46.test.ex +**** diff --git a/test/src/locate.pl b/test/src/locate.pl index 2eb319cdd..ba74e030b 100644 --- a/test/src/locate.pl +++ b/test/src/locate.pl @@ -10,6 +10,7 @@ my @dirs = grep { /^\// && -d } split(/:/, $ENV{PATH}), qw( /bin /usr/bin /usr/sbin + /usr/lib /usr/libexec /usr/local/bin /usr/local/sbin diff --git a/test/stdout/1009 b/test/stdout/1009 index ccda782f5..673bf0a2f 100644 --- a/test/stdout/1009 +++ b/test/stdout/1009 @@ -30,3 +30,24 @@ x@mx46466b.test.ex host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47 host 46b.test.ex [V4NET.0.0.5] MX=47 host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48 +x@mx46.test.ex + router = r1, transport = t1 + host 46.test.ex [V4NET.0.0.4] MX=46 + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 +x@mx46.test.ex + router = r1, transport = t1 + host 46.test.ex [V4NET.0.0.4] MX=46 +x@mx46.test.ex + router = r0, transport = t1 + host 46.test.ex [V4NET.0.0.4] MX=46 + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 +x@mx46.test.ex + router = r0, transport = t1 + host 46.test.ex [V4NET.0.0.4] MX=46 +x@mx46.test.ex + router = r0, transport = t1 + host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] +x@mx46.test.ex + router = r0, transport = t1 + host 46.test.ex [V4NET.0.0.4] |