Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0537

diff --git a/test/stderr/0537 b/test/stderr/0537
index 1d927f518360d3dc5de00b0254a159c5b8f8862b..5142edde8688fc18bdcff7c9532ed03e38fb333f 100644 (file)
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -7,10 +7,10 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> 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 24)

 >>> check acl = log
 >>>  using ACL "log"
 >>> check acl = log
 >>>  using ACL "log"

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

 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]
 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]


@@ -52,10 +52,10 @@ LOG: sender_ident=
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
 >>> 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 24)

 >>> check acl = log
 >>>  using ACL "log"
 >>> check acl = log
 >>>  using ACL "log"

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

 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]
 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]


@@ -86,14 +86,19 @@ LOG: sender_ident=ident
 >>>  end of ACL "log": ACCEPT
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
 >>>  end of ACL "log": ACCEPT
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in dsn_advertise_hosts? no (option unset)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?

 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "mail"
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "mail"

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

 >>> check acl = log
 >>>  using ACL "log"
 >>> check acl = log
 >>>  using ACL "log"

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

 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]
 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]


@@ -124,9 +129,11 @@ LOG: sender_ident=ident
 >>>  end of ACL "log": ACCEPT
 >>> check acl = auth
 >>>  using ACL "auth"
 >>>  end of ACL "log": ACCEPT
 >>> check acl = auth
 >>>  using ACL "auth"

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

 >>>  check authenticated = *
 >>>  check authenticated = *

->>> authname in "*"? yes (matched "*")
+>>>  authname in "*"?
+>>>   list element: *
+>>>   authname in "*"? yes (matched "*")

 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"
 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"


@@ -134,10 +141,10 @@ LOG: +++ host is authenticated +++
 >>> accept: condition test succeeded in ACL "mail"
 >>> end of ACL "mail": ACCEPT
 >>> using ACL "mail"
 >>> accept: condition test succeeded in ACL "mail"
 >>> end of ACL "mail": ACCEPT
 >>> using ACL "mail"

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

 >>> check acl = log
 >>>  using ACL "log"
 >>> check acl = log
 >>>  using ACL "log"

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

 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]
 >>>  check logwrite = ===========================================================
 LOG: ===========================================================
 >>>  check logwrite = sender_ip_address=[$sender_host_address]


@@ -168,9 +175,11 @@ LOG: sender_ident=ident
 >>>  end of ACL "log": ACCEPT
 >>> check acl = auth
 >>>  using ACL "auth"
 >>>  end of ACL "log": ACCEPT
 >>> check acl = auth
 >>>  using ACL "auth"

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

 >>>  check authenticated = *
 >>>  check authenticated = *

->>> authname in "*"? yes (matched "*")
+>>>  authname in "*"?
+>>>   list element: *
+>>>   authname in "*"? yes (matched "*")

 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"
 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"