Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0308

diff --git a/test/stderr/0308 b/test/stderr/0308
index 4a89c24ea5a9c999c012e3c93ab8f5c755839a6a..c030e82321e45303bc32c8698885994a60fd5d60 100644 (file)
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -6,18 +6,27 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> using ACL "acl_V4NET_0_0"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)

 >>> check hosts = *.test.ex
 >>> check hosts = *.test.ex

+>>> host in "*.test.ex"?
+>>>  list element: *.test.ex

 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97

->>> host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
->>> accept: condition test failed in ACL "acl_V4NET_0_0"
->>> processing "accept"
->>> check hosts = V4NET.0.0.97
->>> host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
->>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>>  host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>  accept: condition test failed in ACL "acl_V4NET_0_0"
+>>>  processing "accept" (TESTSUITE/test-config 18)
+>>>  check hosts = V4NET.0.0.97
+>>>  host in "V4NET.0.0.97"?
+>>>   list element: V4NET.0.0.97
+>>>   host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
+>>>  accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>>  end of ACL "acl_V4NET_0_0": ACCEPT

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -26,16 +35,24 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> using ACL "acl_V4NET_0_0"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)

 >>> check hosts = *.test.ex
 >>> check hosts = *.test.ex

+>>> host in "*.test.ex"?
+>>>  list element: *.test.ex

 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded ten-1.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"
+>>>   check dnssec require list
+>>>    ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>   check dnssec request list
+>>>    ten-1.test.ex not in empty list (option unset? cannot trace name)

 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK

->>> host in "*.test.ex"? yes (matched "*.test.ex")
+>>>  host in "*.test.ex"? yes (matched "*.test.ex")

 >>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
 >>> accept: condition test succeeded in ACL "acl_V4NET_0_0"

+>>> end of ACL "acl_V4NET_0_0": ACCEPT