Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0443

diff --git a/test/stderr/0443 b/test/stderr/0443
index 853d171da4fc9692d1171d1d8536361496ae2ef5..75884eae0ea1dc1823b576e601cabce001d8340a 100644 (file)
--- a/test/stderr/0443
+++ b/test/stderr/0443
@@ -6,12 +6,22 @@
 >>> 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 "rcpt"
 >>> using ACL "rcpt"

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

 >>> check verify = sender/callout=1s
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling r1 router
 >>> check verify = sender/callout=1s
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling r1 router

+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")

 >>> routed by r1 router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for ten-1.test.ex
 >>> routed by r1 router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for ten-1.test.ex


@@ -19,5 +29,5 @@
 >>> cannot callout via null transport
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "rcpt"
 >>> cannot callout via null transport
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "rcpt"

-LOG: H=[V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout
-LOG: H=[V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout