X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstdout%2F0002;h=1422289a759a796d2c77e018bdce573581e93c75;hb=1b7cf216d933b395dee691f05becca4dd44b26f7;hp=ee1ef9d93a90f7dda645cd639f0982ebc5ef9b11;hpb=93cc2d6e053031a7008f73ca1ea072038bfa3fc8;p=exim.git

diff --git a/test/stdout/0002 b/test/stdout/0002
index ee1ef9d93..1422289a7 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -14,6 +14,7 @@
 > qualify_domain: myhost.test.ex
 > bounce_return_size_limit: 102400
 > spool_directory: TESTSUITE/spool
+> queue_name: 
 > Failed: unknown variable in "${unknown}"
 > h_subject: (should be empty)
 > h_subject: (should be empty)
@@ -51,6 +52,8 @@
 > reduce: +abc
 > reduce: 6
 > reduce: 9
+> # Check for extract corrupting reduce's 
+> reduce: a , b
 > 
 > listnamed: *.aa.bb : ^\Nxxx(.*)
 > listnamed: *.aa.bb : ^\Nxxx(.*)
@@ -95,8 +98,8 @@
 > 
 > # Operators
 > 
-> Failed: missing or misplaced { or }
-> Failed: missing or misplaced { or }
+> Failed: Not enough arguments for 'acl' (min is 1)
+> Failed: Not enough arguments for 'acl' (min is 1)
 > Failed: error from acl "a_nosuch"
 > acl: (0) [] []
 > acl: (1) [person@dom.ain] []
@@ -120,8 +123,12 @@
 > 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
+newline	tab\134backslash ~tilde\177DEL\200\201.
 > 
-> escape: B7\267F2\362
 > eval:   2
 > eval:   7
 > eval:   9
@@ -168,6 +175,20 @@
 > hex2b64:MPPJPkZDbetYunCBao7BJA==
 > hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE=
 > 
+> base32: 0  <>
+> base32: 1  <b>
+> base32: 31 <7>
+> base32: 32 <ba>
+> base32: 42 <bk>
+> Failed: argument for base32 operator is "0x1", which is not a decimal number
+> 
+> base32d: 0  0
+> base32d: 1  1
+> base32d: 31 31
+> base32d: 32 32
+> 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
 > environments. Write cunning tests that produce the same output in both cases,
 > while doing a reasonable check.
@@ -269,9 +290,9 @@
 > 
 > # Error forms
 > 
-> Failed: missing or misplaced { or }
+> Failed: Not enough arguments for 'hash' (min is 2)
 > Failed: "nonnumber" is not a number (in "hash" expansion)
-> Failed: Too many arguments for "hash" (max is 3)
+> Failed: Too many arguments for 'hash' (max is 3)
 > Failed: "-2" is not a positive number (in "substr" expansion)
 > 
 > # Skipped operators
@@ -343,7 +364,8 @@
 > Failed: unknown variable "post" after "def:"
 > def:h_f n
 > def:h_f n
-> Failed: missing or misplaced { or }
+> Failed: curly-bracket problem in conditional yes/no parsing: 'yes' part did not start with '{'
+ remaining string is ':{y}{n}}'
 > 
 > exists: y
 > exists: n
@@ -372,6 +394,8 @@
 > isip:   y  1.2.3.4
 > isip4:  y  1.2.3.4
 > isip6:  n  1.2.3.4
+> isip:   n  ::1.2.3.256
+> isip4:  n  1.2.3.256
 > isip:   n  1:2:3:4
 > isip4:  n  1:2:3:4
 > isip6:  n  1:2:3:4
@@ -381,6 +405,7 @@
 > isip:   y  fe80::a00:20ff:fe86:a061
 > isip4:  n  fe80::a00:20ff:fe86:a061
 > isip6:  y  fe80::a00:20ff:fe86:a061
+> isip:   y  fe80::1.2.3.4
 > isip:   n  rhubarb
 > isip4:  n  rhubarb
 > isip6:  n  rhubarb
@@ -578,7 +603,8 @@
 > b
 > 
 > a:b:c
-> Failed: missing or misplaced { or } inside "map" item
+> Failed: missing '}' closing extract inside "map" item
+> a:b:c
 > 
 > # Translation
 > 
@@ -664,7 +690,7 @@
 > 
 > # File insertion
 > 
-> Failed: missing or misplaced { or }
+> Failed: Not enough arguments for 'readfile' (min is 1)
 > abcde
 12345
 
@@ -750,7 +776,8 @@ xyz
 > Failed: unknown condition "xya" inside "and{...}" condition
 > Failed: condition name expected, but found "${lookup{x}lsear" inside "and{...}" condition
 > Failed: missing } at end of string - could be header name not terminated by colon
-> Failed: missing or misplaced { or }
+> Failed: curly-bracket problem in conditional yes/no parsing: did not close with '}'
+ remaining string is ''
 > Failed: missing or misplaced { or } - could be header name not terminated by colon
 > Failed: each subcondition inside an "or{...}" condition must be in its own {}
 > Failed: missing } at end of condition inside "or" group