Testsuite: munge for list-search debug output of build-time options

[exim.git] / test / stderr / 0092

diff --git a/test/stderr/0092 b/test/stderr/0092
index 306506e5231b1468cf99d03a885c4d0eabf4e759..740e09a0210798b5bb44edf641a606db496e5792 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -15,27 +15,40 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> 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 "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
+>>> userx@test.ex in "verify@test.ex"?
+>>>  list element: verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -96,6 +109,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.1]
 sender_rcvhost = [V4NET.0.0.1] (helo=test)
@@ -109,19 +125,29 @@ SMTP<< rcpt to:userx@test.ex
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 27)
 check hosts = :
+host in ":"?
+ list element: 
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny" (TESTSUITE/test-config 28)
   message: unrouteable address
 check recipients = verify@test.ex
-address match test: subject=userx@test.ex pattern=verify@test.ex
+userx@test.ex in "verify@test.ex"?
+ list element: verify@test.ex
+ address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
 deny: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
-test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "+local_domains"? yes (matched "+local_domains")
+test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   test.ex in "test.ex : *.test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
@@ -143,22 +169,35 @@ exim: timed out while reading - message abandoned
 >>> 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 "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")
+>>> verify@test.ex in "verify@test.ex"?
+>>>  list element: verify@test.ex
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing verify@test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> calling forward router
 >>> forward router declined for verify@test.ex
 >>> no more routers