X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/26dd3aa007b3b77969610c031f59388e0953bd00..d901e231acd1917d24b688cbd7823efc2bed45c4:/test/stdout/0002?ds=sidebyside

diff --git a/test/stdout/0002 b/test/stdout/0002
index c9337869d..b55571cc6 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -115,6 +115,15 @@
 > listextract: fail
 > Failed: "listextract" failed and "fail" requested
 > 
+> listquote: abcd
+> listquote: ab::cd
+> listquote: ::a::b::c::d::
+> listquote: ab::::cd
+> listquote: ab:cd
+> listquote: ab;;cd
+> listquote:   ab  cd
+> listquote: < >
+> 
 > sort: 1:2:3:4
 > sort: 4,3,2,1
 > sort: a:aa:B:c
@@ -138,7 +147,7 @@
 > 
 > Failed: Not enough arguments for 'acl' (min is 1)
 > Failed: Not enough arguments for 'acl' (min is 1)
-> Failed: error from acl "a_nosuch"
+> Failed: ERROR from acl "a_nosuch"
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
 > acl: (2) [firstarg] [secondarg]
@@ -147,7 +156,7 @@
 > acl: 
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"
 > acl: (2) [new arg1] [top_arg_1]
 > acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
 > 
@@ -161,6 +170,7 @@
 > domain: dom.ain
 > domain: dom.ain
 > domain: dom.ain
+> domain: 
 > 
 > addresses: ''abc@xyz' ''pqr@xyz
 > addresses: local-part@dom.ain
@@ -237,6 +247,7 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > lclpt:  local-part
 > lclpt:  local-part
 > lclpt:  local.part
+> lclpt:  a.b.c
 > quote:  aZ09_.-Q "ab*cd" "abcd\"ef"
 > quote:  "nl(\n)"
 > quote:  "cr(\r)"
@@ -433,9 +444,9 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > match_domain:    yes
 > match_domain:    no
 > 
->  >x@zz.aa.bb< [] >x@zz.aa.bb< 
+>  >x@zz.aa.bb< [zz] >x@zz.aa.bb< 
 > 
->  >x@xxxabc< [] >x@xxxabc< 
+>  >x@xxxabc< [abc] >x@xxxabc< 
 > 
 > match_address:   yes
 > match_address:   yes
@@ -469,7 +480,7 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > acl if: Y:(0) [] []
 > acl if: Y:(1) [argY] []
 > acl if: N:(2) [argN] [arg2]
-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"
 > 
 > # Default values for both if strings
 > 
@@ -480,12 +491,18 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > # lookups that are required in all cases.
 > 
 > CALLER
+> postmaster: CALLER
 > 
 > ==X@Y
 > ==*
 > ==*@Z
 > ==*
 > 
+> x@y  ==X@Y
+> *    ==*
+> *@z  ==*@Z
+> *    ==*
+> 
 > data for a.b.c.d
 > failed x.y.z
 > data for *.p.q
@@ -494,6 +511,14 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > Failed: "lookup" failed and "fail" requested
 > data for *
 > 
+> a.b.c.d: data for a.b.c.d
+> failed x.y.z
+> *.p.q:   data for *.p.q
+> *.p.q:   data for *.p.q
+> *.p.q:   data for *.p.q
+> Failed: "lookup" failed and "fail" requested
+> *:       data for *
+> 
 > q1:  "abc"
 > q2:  "xyz":
 > q3:  "pqr"  :
@@ -502,6 +527,14 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > q6:  "white space"
 > q7:  "b\\s"
 > 
+> q1f: abc           "abc"
+> q2f: xyz:          "xyz":
+> q3f: pqr  :        "pqr"  :
+> q4f: a:b           "a:b" abc continued data (make sure not key)
+> q5f: "quoted"    "\"quoted\""
+> q6f: white space   "white space"
+> q7f: b\s          "b\\s"
+> 
 > abc:   abc
 > a.b.c: *.b.c
 > ab.c:  *b.c
@@ -673,8 +706,8 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > abcd      abcd
 > <:abcd:>  =?iso-8859-8?Q?=3C=3Aabcd=3A=3E?=
 > <:ab cd:> =?iso-8859-8?Q?=3C=3Aab_cd=3A=3E?=
-> long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit?=
-> long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit_by_a_long_way=3B_in?= =?iso-8859-8?Q?_fact_this_one_will_go_over_the_150_character_limit?=
+> long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_ov?= =?iso-8859-8?Q?er_the_75-char_limit?=
+> long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_ov?= =?iso-8859-8?Q?er_the_75-char_limit_by_a_long_way=3B_in_fact_this_on?= =?iso-8859-8?Q?e_will_go_over_the_150_character_limit?=
 > 
 > # RFC 2047 decode
 > 
@@ -873,6 +906,7 @@ xyz
 > escape: B7·F2ò
 > 
 > primary_hostname: myhost.test.ex
+> sender_address: sndr@dom
 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes
@@ -1000,3 +1034,5 @@ xyz
 > in list
 > in list
 > 
+> '${listextract {2} {<. my.target.host.name}}'  =>   'target'
+>