X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstderr%2F0092;h=c06f9deaeb46607342628c55bfc6fe7f09dcdcff;hb=0b8f4f1a0c68bd48a98fb033039bac7d88182b6f;hp=93f70e59c555c05acc1961afb297ab26b5af6f03;hpb=ddf1b11a732e293cd242c80bc63d459dda595bf4;p=exim.git

diff --git a/test/stderr/0092 b/test/stderr/0092
index 93f70e59c..c06f9deae 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -39,8 +39,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: forward propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [V4NET.0.0.1]
@@ -50,33 +48,33 @@ LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.1]
 host in host_lookup? no (option unset)
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
-considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-  expanding: V4NET.0.0.1
-     result: V4NET.0.0.1
-considering: $sender_host_address} {2} {30}}s
-  expanding: $sender_host_address
-     result: V4NET.0.0.1
-  condition: eq {V4NET.0.0.1} {$sender_host_address}
-     result: true
-considering: 2} {30}}s
-  expanding: 2
-     result: 2
-   scanning: 30}}s
-  expanding: 30
-     result: 30
-   skipping: result is not used
-  expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-     result: 2s
+ ┌considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+  ┌considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+  ├──expanding: V4NET.0.0.1
+  └─────result: V4NET.0.0.1
+  ┌considering: $sender_host_address} {2} {30}}s
+  ├──expanding: $sender_host_address
+  └─────result: V4NET.0.0.1
+ ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
+ ├─────result: true
+  ┌considering: 2} {30}}s
+  ├──expanding: 2
+  └─────result: 2
+  ┌───scanning: 30}}s
+  ├──expanding: 30
+  ├─────result: 30
+  └───skipping: result is not used
+ ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+ └─────result: 2s
 host in host_reject_connection? no (option unset)
 host in sender_unqualified_hosts? no (option unset)
 host in recipient_unqualified_hosts? no (option unset)
 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)
-considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-  expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-     result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ ┌considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ └─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:userx@test.ex
@@ -110,7 +108,7 @@ LOG: lost_incoming_connection MAIN
   SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp NULLterminating with rc=1 >>>>>>>>>>>>>>>>
 exim: timed out while reading - message abandoned
 exim: timed out while reading - message abandoned
 >>> host in hosts_connection_nolog? no (option unset)