Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0401

diff --git a/test/stderr/0401 b/test/stderr/0401
index ef9181703afe2c4d7051e772cde6315c84d90028..9f12194fa76f847226209f81e9503ef1c76abe7c 100644 (file)
--- a/test/stderr/0401
+++ b/test/stderr/0401
@@ -7,18 +7,25 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
->>> host in "TESTSUITE/aux-var/0401.hosts1"? yes (matched "V4NET.9.8.7" in TESTSUITE/aux-var/0401.hosts1)
+>>> host in "TESTSUITE/aux-var/0401.hosts1"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts1
+>>>  host in "TESTSUITE/aux-var/0401.hosts1"? yes (matched "V4NET.9.8.7" in TESTSUITE/aux-var/0401.hosts1)
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
+>>> xxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxx in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts2
->>> no IP address found for host a2.2.2 (during SMTP connection from (xxx) [V4NET.9.8.7])
-LOG: no IP address found for host a2.2.2 (during SMTP connection from (xxx) [V4NET.9.8.7])
->>> host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for a2.2.2)
+>>> host in "TESTSUITE/aux-var/0401.hosts2"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts2
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
+>>>  host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL "mail"
 >>> end of ACL "mail": implicit DENY
 LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL <x@y>
@@ -31,12 +38,14 @@ LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL <x@y>
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
+>>> host in "TESTSUITE/aux-var/0401.hosts1"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts1
 >>> sender host name required, to match against *.2.2
 >>> looking up host name for V4NET.9.9.9
 LOG: no host name found for IP address V4NET.9.9.9
->>> host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
+>>>  host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
 >>> accept: condition test failed in ACL "connect"
 >>> end of ACL "connect": implicit DENY
 LOG: H=[V4NET.9.9.9] rejected connection in "connect" ACL