Testsuite: munge for non-WITH_CONTENT_SCAN builds

[exim.git] / test / stderr / 0251

diff --git a/test/stderr/0251 b/test/stderr/0251
index 860af285f0d5fa50bb9b77c6ced4df9c26f6e5f9..558b3675e82985f7a754b894d24455bfc4f0e5cb 100644 (file)
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -6,47 +6,85 @@
 >>> 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 "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)
+>>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> sender in "sender"? yes (matched "sender")
->>> ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
+>>>  sender in "sender"?
+>>>   list element: sender
+>>>   sender in "sender"? yes (matched "sender")
+>>>  ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
 >>> calling exeter_listr router
 >>> routed by exeter_listr router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing xxx@listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> sender in "zzzz"? no (end of list)
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> ok@sender in "zzzz"?
+>>>  list element: zzzz
+>>>  sender in "zzzz"?
+>>>   list element: zzzz
+>>>  sender in "zzzz"? no (end of list)
 >>> ok@sender in "zzzz"? no (end of list)
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
->>> deny: condition test failed
->>> processing "accept"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
->>> listr.test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> listr.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  listr.test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   list element: *.test.ex
+>>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)
+>>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
 >>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? no (end of list)
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
->>> deny: condition test failed
->>> processing "accept"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
->>> listr.test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> listr.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  listr.test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   list element: *.test.ex
+>>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 
 ******** SERVER ********