use ifdefs for the routers-supported -bV rather than the info table

[exim.git] / test / stderr / 4031

diff --git a/test/stderr/4031 b/test/stderr/4031
index 03da8b266d2f43b59ac25e37a26f6e3a61b3048e..0bf58bede4d05b21006368680ed1805162e5a9a9 100644 (file)
--- a/test/stderr/4031
+++ b/test/stderr/4031
@@ -8,8 +8,6 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>>  list element: ip4.ip4.ip4.ip4
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>>  list element: ip4.ip4.ip4.ip4

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -34,7 +32,7 @@ LOG: remote         [127.0.0.2]:1111
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss

 ### protocol v1 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 ### protocol v1 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -47,8 +45,6 @@ LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss
 >>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2
 >>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -73,7 +69,7 @@ LOG: remote         [127.0.0.2]:1113
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
+LOG: 10HmaY-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss

 ### protocol v2 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 ### protocol v2 receive
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -86,8 +82,6 @@ LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip
 >>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2
 >>>  list element: ip4.ip4.ip4.ip4
 >>> looking up host name for 127.0.0.2
 LOG: no host name found for IP address 127.0.0.2

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> clientname in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -112,7 +106,7 @@ LOG: remote         [127.0.0.2]:1115
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "r_acl"
 >>> end of ACL "r_acl": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss
+LOG: 10HmaZ-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss

 ### proxy timeout
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 ### proxy timeout
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -123,8 +117,6 @@ LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>>  list element: ip4.ip4.ip4.ip4
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>>  list element: ip4.ip4.ip4.ip4

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 
 ******** SERVER ********
 ### non-prox plain receive
 
 ******** SERVER ********
 ### non-prox plain receive