GnuTLS: fix $tls_X_ver generation

[users/jgh/exim.git] / test / stderr / 0092

diff --git a/test/stderr/0092 b/test/stderr/0092
index c06f9deaeb46607342628c55bfc6fe7f09dcdcff..715ca795c04bb299a35a9e1fd58994f952561081 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -16,16 +16,16 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)

 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")


@@ -48,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]
   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]

- â\94\8cconsidering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-  â\94\8cconsidering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+ â\95­considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+  â\95­considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s

   ├──expanding: V4NET.0.0.1
   ├──expanding: V4NET.0.0.1

-  â\94\94─────result: V4NET.0.0.1
-  â\94\8cconsidering: $sender_host_address} {2} {30}}s
+  â\95°─────result: V4NET.0.0.1
+  â\95­considering: $sender_host_address} {2} {30}}s

   ├──expanding: $sender_host_address
   ├──expanding: $sender_host_address

-  â\94\94─────result: V4NET.0.0.1
+  â\95°─────result: V4NET.0.0.1

  ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
  ├─────result: true
  ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
  ├─────result: true

-  â\94\8cconsidering: 2} {30}}s
+  â\95­considering: 2} {30}}s

   ├──expanding: 2
   ├──expanding: 2

-  â\94\94─────result: 2
-  â\94\8c───scanning: 30}}s
+  â\95°─────result: 2
+  â\95­───scanning: 30}}s

   ├──expanding: 30
   ├─────result: 30
   ├──expanding: 30
   ├─────result: 30

-  â\94\94───skipping: result is not used
+  â\95°───skipping: result is not used

  ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
  ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s

- â\94\94─────result: 2s
+ â\95°─────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)
 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)

- â\94\8cconsidering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ â\95­considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full

  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full

- â\94\94─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────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
 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


@@ -83,17 +83,17 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:userx@test.ex
 using ACL "check_recipient"
 SMTP>> 250 OK
 SMTP<< rcpt to:userx@test.ex
 using ACL "check_recipient"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 24)

 check hosts = :
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 check hosts = :
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "deny"
+processing "deny" (TESTSUITE/test-config 25)

   message: unrouteable address
 check recipients = verify@test.ex
 address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
 deny: condition test failed in ACL "check_recipient"
   message: unrouteable address
 check recipients = verify@test.ex
 address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
 deny: condition test failed in ACL "check_recipient"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 28)

 check domains = +local_domains
 test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")
 check domains = +local_domains
 test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")


@@ -120,11 +120,11 @@ exim: timed out while reading - message abandoned
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")