Testsuite: better non-TFO-system debug handling

[users/heiko/exim.git] / test / stderr / 0145

diff --git a/test/stderr/0145 b/test/stderr/0145
index 41524a026a4fb653668522585ee33de4c2b21a94..cd1151a2bc64865deee1c9fc5602def76690fb39 100644 (file)
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -7,7 +7,7 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
@@ -16,7 +16,8 @@
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------
->>> require: condition test failed
+>>> require: condition test failed in ACL "check_recipient"
+>>> end of ACL "check_recipient": not OK
 LOG: H=[V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
 LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed
 >>> host in hosts_connection_nolog? no (option unset)
@@ -28,15 +29,15 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router
 >>> routed by domainlist router
 >>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "require"
+>>> require: condition test succeeded in ACL "check_recipient"
+>>> processing "require" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
@@ -45,5 +46,6 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail
 >>> "more" is false: skipping remaining routers
 >>> no more routers
 >>> ----------- end verify ------------
->>> require: condition test failed
+>>> require: condition test failed in ACL "check_recipient"
+>>> end of ACL "check_recipient": not OK
 LOG: H=[V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses