Testsuite: output changes resulting from 055e2cb463e4

[users/jgh/exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index 7200bf3a78211242dec6167423f42de127cf4aeb..9a3219d59c404bdf2f4218d7ce608e36541f7b1b 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -6,6 +6,9 @@
 > # Some fixed variables
 > 
 > exim_path: TESTSUITE/eximdir/exim
 > # Some fixed variables
 > 
 > exim_path: TESTSUITE/eximdir/exim

+> exim_version: x.yz
+> config_dir: TESTSUITE
+> config_file: TESTSUITE/test-config

 > primary_hostname: myhost.test.ex
 > primary_hostname: myhost.test.ex
 > qualify_domain: myhost.test.ex
 > primary_hostname: myhost.test.ex
 > primary_hostname: myhost.test.ex
 > qualify_domain: myhost.test.ex


@@ -71,6 +74,13 @@
 > listextract: fail
 > Failed: "extract" failed and "fail" requested
 > 
 > listextract: fail
 > Failed: "extract" failed and "fail" requested
 > 

+> sort: 1:2:3:4
+> sort: 4,3,2,1
+> sort: a:aa:B:c
+> sort: 10 smtp.ex.com:100 r2.ex.com:666 r99.ex.com
+> sort: 10,smtp.ex.com:100,r2.ex.com:666,r99.ex.com
+> sort: ""
+> 

 > # Tests with iscntrl() and illegal separators
 > 
 > map: 'a'
 > # Tests with iscntrl() and illegal separators
 > 
 > map: 'a'


@@ -768,6 +778,11 @@ xyz
 > 
 > true
 > 
 > 
 > true
 > 

+> # Environment access
+> 
+> CALLER
+> correct
+> 

 > 
 > escape: B7·F2ò
 > 
 > 
 > escape: B7·F2ò
 > 


@@ -777,6 +792,7 @@ xyz
 > yes
 > match_address:   no
 > 
 > yes
 > match_address:   no
 > 

+> -be Sender host name and address etc, all unset

 > -oMa  sender_host_address = 
 >       sender_host_port = 0
 > -oMaa sender_host_authenticated = 
 > -oMa  sender_host_address = 
 >       sender_host_port = 0
 > -oMaa sender_host_authenticated = 


@@ -788,6 +804,7 @@ xyz
 > -oMs  sender_host_name = 
 > -oMt  sender_ident = CALLER
 > 
 > -oMs  sender_host_name = 
 > -oMt  sender_ident = CALLER
 > 

+> -be Sender host name and address etc, all set except host name.

 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMaa sender_host_authenticated = AAA
 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMaa sender_host_authenticated = AAA


@@ -798,16 +815,20 @@ xyz
 > -oMr  received_protocol = special
 > -oMt  sender_ident = me
 > 
 > -oMr  received_protocol = special
 > -oMt  sender_ident = me
 > 

+> -be Sender host name explicitly set

 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMs  sender_host_name = my.host.name
 > 
 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMs  sender_host_name = my.host.name
 > 

+> be Sender host name lookup fails (V4NET.11.12.13 is not reverse registered)

 > -oMs  sender_host_name = 
 >       host_lookup_failed = 1
 > 
 > -oMs  sender_host_name = 
 >       host_lookup_failed = 1
 > 

+> -be Sender host name and protocol set by Sendmail-compatible option

 > -p  received_protocol = special
 > -p  sender_host_name = host.name
 > 
 > -p  received_protocol = special
 > -p  sender_host_name = host.name
 > 

+> -be Sender host name and address etc, all set except host name

 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMaa sender_host_authenticated = AAA
 > -oMa  sender_host_address = V4NET.0.0.1
 >       sender_host_port = 1234
 > -oMaa sender_host_authenticated = AAA