Testsuite: output changes resulting

[exim.git] / test / stderr / 5410

diff --git a/test/stderr/5410 b/test/stderr/5410
index 9953eee7cd2f31e396d237708388f899e4a8f940..db1df1c3e60fafa9d91350f26bcc57fdd715e1be 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
@@ -219,18 +220,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
@@ -282,8 +271,9 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
@@ -472,18 +462,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
@@ -535,8 +513,9 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
@@ -725,18 +704,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
@@ -788,6 +755,6 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********