Debug: quieten environment-cleaning

1 files changed, 68 insertions, 62 deletions

diff --git a/test/stderr/0398 b/test/stderr/0398
index 5708b6dce..8836a6d46 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -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
 changed uid/gid: privilege not needed
@@ -41,11 +25,13 @@ SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -56,20 +42,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 set transport t2
@@ -95,11 +84,13 @@ sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
 processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -110,20 +101,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
@@ -156,7 +150,8 @@ Attempting full verification using callout
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=PORT_S
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+ list element: 
  connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
@@ -200,11 +195,13 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown
 processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
@@ -212,21 +209,25 @@ SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
 deny: condition test failed in ACL "rcpt"
 processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -237,20 +238,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
@@ -290,11 +294,13 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted