X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5b80e59458182b2d557a929a18cb8c70cd56b68..1c477b37eeb5251be787bd56936ba668e41c8c4a:/test/stdout/0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index 5593f06cc..949c35eb2 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -123,6 +123,7 @@
 > addresses: local-part@dom.ain+xyz@abc
 > addresses: local-part@dom.ain:xyz@abc:p@q:r@s
 > addresses: 
+> Failed: output separator missing in expanding ${addresses:>}
 > 
 > escape:     B7\267F2\362
 > excape8bit: undisturbed text	tab
@@ -188,7 +189,7 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > base32d: 42 42
 > Failed: argument for base32d operator is "ABC", which is not a base 32 number
 > 
-> The base62 operator is actually a base36 operator in the Darwin and Cygwin
+> the base62 operator is actually a base36 operator in the Darwin and Cygwin
 > environments. Write cunning tests that produce the same output in both cases,
 > while doing a reasonable check.
 > 
@@ -494,8 +495,8 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > a.b.c: *.b.c
 > ab.c:  *b.c
 > xyz:   ^X
-> Xyz:   ^X
-> Zyz:   ^Z
+> .Xyz:   ^X
+> .Zyz:   ^Z
 > a b:   "^a +b"
 > a  b:  "^a +b"
 > a:b:   lookup succeeded
@@ -510,8 +511,8 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > a.b.c: *.b.c
 > ab.c:  *b.c
 > xyz:   ^X
-> Xyz:   ^X
-> Zyz:   ^Z
+> .Xyz:   ^X
+> .Zyz:   ^Z
 > a b:   "^a +b"
 > a  b:  "^a +b"
 > a:b:   lookup succeeded
@@ -530,10 +531,10 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > 
 > # Some tests of case-(in)dependence
 > 
-> MiXeD-CD:  Data found for case-dependent MiXeD-CD
-> MixeD-CD:  NOT FOUND
-> MiXeD-Ncd: Data found for case-independent MiXeD-nCD
-> MixeD-Ncd: Data found for case-independent MiXeD-nCD
+> .MiXeD-CD:  Data found for case-dependent MiXeD-CD
+> .MixeD-CD:  NOT FOUND
+> .MiXeD-Ncd: Data found for case-independent MiXeD-nCD
+> .MixeD-Ncd: Data found for case-independent MiXeD-nCD
 > 
 > # IP address (CIDR) lookups
 > 
@@ -577,12 +578,12 @@ newline	tab\134backslash ~tilde\177DEL\200\201.
 > 2
 > 2
 > 2
-> Empty:<>
-> Empty:<>
+> empty:<>
+> empty:<>
 > <3>
 > <3>
-> Empty:<>
-> Empty:<>
+> empty:<>
+> empty:<>
 > no Z
 > no 4
 > Failed: "extract" failed and "fail" requested
@@ -661,8 +662,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_?= =?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?=
 > 
 > # RFC 2047 decode
 > 
@@ -707,25 +708,25 @@ xyz
 > abcd
 1234
 
-> RC=0
+> rc=0
 > 1
-> RC=0
+> rc=0
 > abcd
 1234
 
-> RC=0
+> rc=0
 > 2
-> RC=1
+> rc=1
 > abcd
 1234
 
-> RC=1
+> rc=1
 > N
-> RC=127
+> rc=127
 > >><<
-> RC=0
+> rc=0
 > 1!=2
-> RC=0
+> rc=0
 > 
 > # PRVS
 > 
@@ -735,9 +736,9 @@ xyz
 > 
 > # Syntax errors
 > 
-> Failed: prvs second argument must be a single digit
-> Failed: prvs second argument must be a single digit
-> Failed: prvs second argument must be a single digit
+> Failed: prvs third argument must be a single digit
+> Failed: prvs third argument must be a single digit
+> Failed: prvs third argument must be a single digit
 > 
 > # Correct checks; can't put explicit addresses in the tests, because they
 > # will change over time.
@@ -828,6 +829,22 @@ xyz
 > CALLER
 > correct
 > 
+> # JSON
+> 
+> "http://www.example.com/image/481989943"
+> 100
+> 943
+> 943
+> 
+> 59
+> 59
+> 
+> {"1":116, "2":943, "3":234}
+> expect: {"1":116, "2":943, "3":234}
+> 
+> {"1":116, "2":943, "3":234}
+> expect: {"1":116, "2":943, "3":234}
+> 
 > 
 > escape: B7·F2ò
 > 
@@ -837,6 +854,12 @@ xyz
 > yes
 > match_address:   no
 > 
+> primary_hostname: myhost.test.ex
+> match:  cdab
+> Failed: "if" failed and "fail" requested
+> yes
+> match_address:   no
+> 
 > -be Sender host name and address etc, all unset
 > -oMa  sender_host_address = 
 >       sender_host_port = 0