Debug: quieten environment-cleaning

1 files changed, 270 insertions, 263 deletions

diff --git a/test/stderr/0183 b/test/stderr/0183
index 0e745f812..36ab7a1b4 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -32,28 +16,32 @@ routing userx@test.again.dns
 --------> srv router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of test.again.dns (MX) using fakens
 DNS lookup of test.again.dns (MX) gave TRY_AGAIN
 test.again.dns in dns_again_means_nonexist? no (option unset)
@@ -70,27 +58,31 @@ routing abcd@test.again.dns
 --------> srv router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN
 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
@@ -103,34 +95,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -153,29 +149,33 @@ routing usery@test.again.dns
 --------> srv router <--------
 local_part=usery domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=test.again.dns
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@test.again.dns
   domain = test.again.dns
 route_item = * $domain bydns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.again.dns' options = 'bydns'
 set transport smtp
 finding IP address for test.again.dns
 doing DNS lookup
-list element: *
-test.again.dns in "*"? yes (matched "*")
-list element: *
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.again.dns (A) using fakens
 DNS lookup of test.again.dns (A) gave TRY_AGAIN
 test.again.dns in dns_again_means_nonexist? no (option unset)
@@ -192,29 +192,33 @@ routing userz@test.again.dns
 --------> srv router <--------
 local_part=userz domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@test.again.dns
   domain = test.again.dns
 route_item = * $domain bydns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.again.dns' options = 'bydns'
 finding IP address for test.again.dns
 doing DNS lookup
-list element: *
-test.again.dns in "*"? yes (matched "*")
-list element: *
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.again.dns (A): using cached value DNS_AGAIN
 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
@@ -227,29 +231,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -267,22 +275,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -298,28 +290,32 @@ routing userx@test.fail.dns
 --------> srv router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of test.fail.dns (MX) using fakens
 DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
 returning DNS_FAIL
@@ -335,27 +331,31 @@ routing abcd@test.fail.dns
 --------> srv router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL
 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
@@ -368,34 +368,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -418,29 +422,33 @@ routing usery@test.fail.dns
 --------> srv router <--------
 local_part=usery domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=test.fail.dns
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@test.fail.dns
   domain = test.fail.dns
 route_item = * $domain bydns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.fail.dns' options = 'bydns'
 set transport smtp
 finding IP address for test.fail.dns
 doing DNS lookup
-list element: *
-test.fail.dns in "*"? yes (matched "*")
-list element: *
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.fail.dns (A) using fakens
 DNS lookup of test.fail.dns (A) gave NO_RECOVERY
 returning DNS_FAIL
@@ -456,29 +464,33 @@ routing userz@test.fail.dns
 --------> srv router <--------
 local_part=userz domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@test.fail.dns
   domain = test.fail.dns
 route_item = * $domain bydns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.fail.dns' options = 'bydns'
 finding IP address for test.fail.dns
 doing DNS lookup
-list element: *
-test.fail.dns in "*"? yes (matched "*")
-list element: *
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.fail.dns (A): using cached value DNS_FAIL
 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
@@ -491,29 +503,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -531,22 +547,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -562,28 +562,32 @@ routing userx@nonexist.test.ex
 --------> srv router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.test.ex
   domain = nonexist.test.ex
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 DNS lookup of nonexist.test.ex (MX) using fakens
 DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -601,27 +605,31 @@ routing abcd@nonexist.test.ex
 --------> srv router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH
 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
@@ -635,34 +643,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -685,29 +697,33 @@ routing usery@nonexist.test.ex
 --------> srv router <--------
 local_part=usery domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=nonexist.test.ex
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@nonexist.test.ex
   domain = nonexist.test.ex
 route_item = * $domain bydns
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 set transport smtp
 finding IP address for nonexist.test.ex
 doing DNS lookup
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
-list element: *
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
+ list element: *
 DNS lookup of nonexist.test.ex (A) using fakens
 DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -724,29 +740,33 @@ routing userz@nonexist.test.ex
 --------> srv router <--------
 local_part=userz domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@nonexist.test.ex
   domain = nonexist.test.ex
 route_item = * $domain bydns
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 finding IP address for nonexist.test.ex
 doing DNS lookup
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
-list element: *
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
+ list element: *
 DNS lookup of nonexist.test.ex (A): using cached value DNS_NOMATCH
 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
@@ -759,29 +779,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -799,22 +823,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -830,21 +838,24 @@ routing srv@test.again.dns
 --------> srv router <--------
 local_part=srv domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
-srv in "^srv"? yes (matched "^srv")
+srv in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
+ srv in "^srv"? yes (matched "^srv")
 calling srv router
 srv router called for srv@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
 DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
 _smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
 returning DNS_AGAIN
  writing neg-cache entry for _smtp._tcp.test.again.dns-SRV-xxxx, ttl -1
-list element: test.fail.dns
+test.again.dns in "test.fail.dns"?
+ list element: test.fail.dns
 test.again.dns in "test.fail.dns"? no (end of list)
 srv router: defer for srv@test.again.dns
   message: host lookup did not complete
@@ -857,29 +868,33 @@ routing srv@test.fail.dns
 --------> srv router <--------
 local_part=srv domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
-srv in "^srv"? yes (matched "^srv")
+srv in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
+ srv in "^srv"? yes (matched "^srv")
 calling srv router
 srv router called for srv@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
 DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
 returning DNS_FAIL
  writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
-list element: test.fail.dns
-test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
+test.fail.dns in "test.fail.dns"?
+ list element: test.fail.dns
+ test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
 DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
 DNS lookup of test.fail.dns (MX) using fakens
 DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
 returning DNS_FAIL
  writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
-list element: test.fail.dns
-test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
+test.fail.dns in "test.fail.dns"?
+ list element: test.fail.dns
+ test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
 DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
-list element: *
+ list element: *
 DNS lookup of test.fail.dns (A) using fakens
 DNS lookup of test.fail.dns (A) gave NO_RECOVERY
 returning DNS_FAIL
@@ -891,22 +906,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -922,28 +921,32 @@ routing userx@nonexist.example.com
 --------> srv router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.example.com
   domain = nonexist.example.com
-list element: *
-nonexist.example.com in "*"? yes (matched "*")
+nonexist.example.com in "*"?
+ list element: *
+ nonexist.example.com in "*"? yes (matched "*")
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -961,22 +964,25 @@ routing userd@nonexist.example.com
 --------> srv router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: usery
-list element: userz
+userd in "usery:userz"?
+ list element: usery
+ list element: userz
 userd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: !userd
-userd in "!userd"? no (matched "!userd")
+userd in "!userd"?
+ list element: !userd
+ userd in "!userd"? no (matched "!userd")
 lookuphost router skipped: local_parts mismatch
 --------> delay router <--------
 local_part=userd domain=nonexist.example.com
@@ -991,8 +997,9 @@ checking "condition" "${acl {delay}}"...
 calling delay router
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
-list element: *
-nonexist.example.com in "*"? yes (matched "*")
+nonexist.example.com in "*"?
+ list element: *
+ nonexist.example.com in "*"? yes (matched "*")
 DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND