Testsuite: handle RC tagging convention

[exim.git] / test / stderr / 1002

diff --git a/test/stderr/1002 b/test/stderr/1002
index b5a5015fba5adf5381130229420d59515b3db8ea..d01a05d7b3dea3927a8ab8c04e4b85ad62a5907d 100644 (file)
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -7,19 +7,23 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
+>>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
 >>> [::1] in "@ : @[]"? yes (matched "@[]")
->>> require: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> require: condition test succeeded in ACL "acl_rcpt_1"
+>>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL "acl_rcpt_1"
+>>> end of ACL "acl_rcpt_1": ACCEPT
 >>> using ACL "acl_rcpt_6"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 44)
+>>>   message: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
 >>> check domains = <+ @mx_any/ignore=<;127.0.0.1;::1
 >>> ::1 in "<;127.0.0.1;::1"? yes (matched "::1")
 >>> 127.0.0.1 in "<;127.0.0.1;::1"? yes (matched "127.0.0.1")
 >>> V4NET.0.0.1 in "<;127.0.0.1;::1"? no (end of list)
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
->>> require: condition test failed
+>>> require: condition test failed in ACL "acl_rcpt_6"
+>>> end of ACL "acl_rcpt_6": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1