git://git.exim.org / users / jgh / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: fix munging of now-indented date in stdout
[users/jgh/exim.git] / test / stderr / 0544
diff --git a/test/stderr/0544 b/test/stderr/0544
index a95583ab70165d07ffd893f9dcda79f00773a22c..00ffeb85baba866cc5bd19a476594e10c3fec2fa 100644 (file)
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -1,110 +1,114 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-considering: ${tod_full}
-  expanding: ${tod_full}
-     result: Tue, 2 Mar 1999 09:44:33 +0000
-considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
+ /considering: ${tod_full}
+ |__expanding: ${tod_full}
+ \_____result: Tue, 2 Mar 1999 09:44:33 +0000
+ /considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-condition: def:sender_rcvhost
-   result: false
-   scanning: from $sender_rcvhost
+ |__condition: def:sender_rcvhost
+ |_____result: false
+  /   scanning: from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-  expanding: from $sender_rcvhost
+  |__expanding: from $sender_rcvhost
        
-     result: from 
+  |_____result: from 
        
-   skipping: result is not used
-considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+  \___skipping: result is not used
+  /considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-condition: def:sender_ident
-   result: true
-considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+  |__condition: def:sender_ident
+  |_____result: true
+   /considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+   ./considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-  expanding: $sender_ident
-     result: CALLER
-  expanding: from ${quote_local_part:$sender_ident} 
-     result: from CALLER 
-condition: def:sender_helo_name
-   result: false
-   scanning: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+   .|__expanding: $sender_ident
+   .\_____result: CALLER
+   |__expanding: from ${quote_local_part:$sender_ident} 
+   \_____result: from CALLER 
+  |__condition: def:sender_helo_name
+  |_____result: false
+   /   scanning: (helo=$sender_helo_name)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-  expanding: (helo=$sender_helo_name)
+   |__expanding: (helo=$sender_helo_name)
        
-     result: (helo=)
+   |_____result: (helo=)
        
-   skipping: result is not used
-  expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   \___skipping: result is not used
+  |__expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
-     result: from CALLER 
-condition: def:received_protocol
-   result: true
-considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
+  \_____result: from CALLER 
+ |__condition: def:received_protocol
+ |_____result: true
+  /considering: with $received_protocol}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}
+  |__expanding: with $received_protocol
+  \_____result: with local
+ |__condition: def:tls_cipher
+ |_____result: false
+  /   scanning: ($tls_cipher)
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-  expanding: with $received_protocol
-     result: with local
-condition: def:sender_address
-   result: true
-considering: (envelope-from <$sender_address>)
+  |__expanding: ($tls_cipher)
+       
+  |_____result: ()
+       
+  \___skipping: result is not used
+ |__condition: def:sender_address
+ |_____result: true
+  /considering: (envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-  expanding: (envelope-from <$sender_address>)
+  |__expanding: (envelope-from <$sender_address>)
        
-     result: (envelope-from <CALLER@test.ex>)
+  \_____result: (envelope-from <CALLER@test.ex>)
        
-condition: def:received_for
-   result: false
-   scanning: 
+ |__condition: def:received_for
+ |_____result: false
+  /   scanning: 
        for $received_for}}
-  expanding: 
+  |__expanding: 
        for $received_for
-     result: 
+  |_____result: 
        for 
-   skipping: result is not used
-  expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
+  \___skipping: result is not used
+ |__expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-       }}(Exim $version_number)
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-     result: Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ \_____result: Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
-considering: ${tod_full}
-  expanding: ${tod_full}
-     result: Tue, 2 Mar 1999 09:44:33 +0000
+ /considering: ${tod_full}
+ |__expanding: ${tod_full}
+ \_____result: Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -112,43 +116,43 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-considering: $domain
-  expanding: $domain
-     result: domain1.ex
+ /considering: $domain
+ |__expanding: $domain
+ \_____result: domain1.ex
 LOG: MAIN
   == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
 LOG: MAIN
   == userx@domain2.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
-considering: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-considering: $h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_list-id:$h_list-post:$h_list-subscribe:
-     result: 
-considering: } }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: 
-     result: 
-considering: $h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_precedence:
-     result: 
-considering: (?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: (?i)bulk|list|junk
-     result: (?i)bulk|list|junk
-considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_auto-submitted:
-     result: 
-considering: (?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: (?i)auto-generated|auto-replied
-     result: (?i)auto-generated|auto-replied
-condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }}
-   result: false
-   scanning: no}{yes}}
-  expanding: no
-     result: no
-   skipping: result is not used
-considering: yes}}
-  expanding: yes
-     result: yes
-  expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-     result: yes
+ /considering: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  /considering: $h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: $h_list-id:$h_list-post:$h_list-subscribe:
+  \_____result: 
+  /considering: } }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: 
+  \_____result: 
+  /considering: $h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: $h_precedence:
+  \_____result: 
+  /considering: (?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: (?i)bulk|list|junk
+  \_____result: (?i)bulk|list|junk
+  /considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: $h_auto-submitted:
+  \_____result: 
+  /considering: (?i)auto-generated|auto-replied} }} {no}{yes}}
+  |__expanding: (?i)auto-generated|auto-replied
+  \_____result: (?i)auto-generated|auto-replied
+ |__condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }}
+ |_____result: false
+  /   scanning: no}{yes}}
+  |__expanding: no
+  |_____result: no
+  \___skipping: result is not used
+  /considering: yes}}
+  |__expanding: yes
+  \_____result: yes
+ |__expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
+ \_____result: yes
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -156,32 +160,32 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-  expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-     result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-considering: ${if match_domain {$sender_helo_name}{+dlist}}
-considering: $sender_helo_name}{+dlist}}
-  expanding: $sender_helo_name
-     result: ehlo.domain
-considering: +dlist}}
-  expanding: +dlist
-     result: +dlist
-considering: $domain
-  expanding: $domain
-     result: ehlo.domain
-condition: match_domain {$sender_helo_name}{+dlist}
-   result: true
-  expanding: ${if match_domain {$sender_helo_name}{+dlist}}
-     result: true
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=/sender_domain=sender.domain
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=recipient.domain/sender_domain=sender.domain
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=recipient.domain/sender_domain=sender.domain
+ /considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ |__expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ \_____result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ /considering: ${if match_domain {$sender_helo_name}{+dlist}}
+  /considering: $sender_helo_name}{+dlist}}
+  |__expanding: $sender_helo_name
+  \_____result: ehlo.domain
+  /considering: +dlist}}
+  |__expanding: +dlist
+  \_____result: +dlist
+  /considering: $domain
+  |__expanding: $domain
+  \_____result: ehlo.domain
+ |__condition: match_domain {$sender_helo_name}{+dlist}
+ |_____result: true
+ |__expanding: ${if match_domain {$sender_helo_name}{+dlist}}
+ \_____result: true
+ /considering: domain=$domain/sender_domain=$sender_address_domain
+ |__expanding: domain=$domain/sender_domain=$sender_address_domain
+ \_____result: domain=/sender_domain=sender.domain
+ /considering: domain=$domain/sender_domain=$sender_address_domain
+ |__expanding: domain=$domain/sender_domain=$sender_address_domain
+ \_____result: domain=recipient.domain/sender_domain=sender.domain
+ /considering: domain=$domain/sender_domain=$sender_address_domain
+ |__expanding: domain=$domain/sender_domain=$sender_address_domain
+ \_____result: domain=recipient.domain/sender_domain=sender.domain
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
Jeremy Harris' staging directory