X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f90d49f7dacfd209a5584c7da8ce8a275278bba1..9dbbd9a5b838b85c2db09eaee9f26ef25b7c4ae4:/test/stdout/0002?ds=sidebyside diff --git a/test/stdout/0002 b/test/stdout/0002 index ee351a278..20f418360 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,7 +175,21 @@ > hex2b64:MPPJPkZDbetYunCBao7BJA== > hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE= > -> The base62 operator is actually a base36 operator in the Darwin and Cygwin +> base32: 0 <> +> base32: 1 +> base32: 31 <7> +> base32: 32 +> base32: 42 +> 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 @@ -470,8 +495,8 @@ > 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 @@ -486,8 +511,8 @@ > 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 @@ -506,10 +531,10 @@ > > # 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 > @@ -553,12 +578,12 @@ > 2 > 2 > 2 -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > <3> > <3> -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > no Z > no 4 > Failed: "extract" failed and "fail" requested @@ -577,6 +602,10 @@ > Failed: first argument of "extract" must not be empty > b > +> a:b:c +> Failed: missing '}' closing extract inside "map" item +> a:b:c +> > # Translation > > abcdea aaa xyz zbcdez @@ -633,8 +662,8 @@ > 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 > @@ -661,7 +690,7 @@ > > # File insertion > -> Failed: missing or misplaced { or } +> Failed: Not enough arguments for 'readfile' (min is 1) > abcde 12345 @@ -679,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 > @@ -707,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. @@ -747,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