Bug 1518: fix description of condition processing

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

diff --git a/test/stdout/0002 b/test/stdout/0002
index 377fe02cd417bd5fd20d2b9843c00da7d148c899..7200bf3a78211242dec6167423f42de127cf4aeb 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -64,6 +64,13 @@
 > listcount: 3
 > listcount: 2
 > 
 > listcount: 3
 > listcount: 2
 > 

+> listextract: b
+> listextract: XcX
+> listextract: 
+> listextract: 
+> listextract: fail
+> Failed: "extract" failed and "fail" requested
+> 

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


@@ -80,14 +87,18 @@
 > 
 > Failed: missing or misplaced { or }
 > Failed: missing or misplaced { or }
 > 
 > Failed: missing or misplaced { or }
 > Failed: missing or misplaced { or }

-> Failed: acl "a_bad" did not accept
-> acl: []
-> acl: [person@dom.ain]
+> Failed: error from acl "a_nosuch"
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> acl: (2) [firstarg] [secondarg]
+> acl: (1) [arg with spaces] []

 > acl: 
 > acl: 
 > acl: 
 > acl: 

-> Failed: acl "a_deny" did not accept
-> Failed: acl "a_deny" did not accept
-> acl:  [1] [2] [3] [4]
+> acl: (0) [] []
+> acl: (1) [person@dom.ain] []
+> Failed: error from acl "a_defer"
+> acl: (2) [new arg1] [top_arg_1]
+> acl:  (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []

 > 
 > addrss: local-part@dom.ain
 > addrss: local-part@dom.ain
 > 
 > addrss: local-part@dom.ain
 > addrss: local-part@dom.ain


@@ -192,6 +203,7 @@
 > quote_local_part: "abcd\"ef"
 > quote_local_part: ""
 > rxquote:aZ09\_\,\-Q ab\*cd abcd\"ef
 > quote_local_part: "abcd\"ef"
 > quote_local_part: ""
 > rxquote:aZ09\_\,\-Q ab\*cd abcd\"ef

+> hexquote: \x01\x02\x03\x04\x05\x06\x07\x20\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x20\x10\x11\x12\x13\x14\x15\x16\x17\x20\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x20!"#$%&'\x20()*+,-./\x2001234567\x2089:;<=>?\x20@ABCDEFG\x20HIJKLMNO\x20PQRSTUVW\x20XYZ[\]^_\x20`abcdefg\x20hijklmno\x20pqrstuvw\x20xyz{|}~\x7f

 > substr: ba 34  1
 > substr: barb rhuba
 > substr: 
 > substr: ba 34  1
 > substr: barb rhuba
 > substr: 


@@ -255,9 +267,11 @@
 > # Numeric overflow
 > # >32b should work, >64b not
 > 
 > # Numeric overflow
 > # >32b should work, >64b not
 > 

-> 4096M      y
-> 4096000000 y
-> 4611686018427387904  y
+> 1 > 2047M                n
+> 1 > 2048M                n
+> 1 > 4096000000           n
+> 1 > 4096M                n
+> 1 > 4611686018427387904  n

 > Failed: absolute value of integer "46116860184273879040" is too large (overflow)
 > 
 > # Conditions
 > Failed: absolute value of integer "46116860184273879040" is too large (overflow)
 > 
 > # Conditions


@@ -290,6 +304,7 @@
 > 5>3m:   n
 > Failed: invalid integer "3z "
 > Failed: integer expected but "a" found
 > 5>3m:   n
 > Failed: invalid integer "3z "
 > Failed: integer expected but "a" found

+> Failed: integer expected but "${substr_2_2:65535}" found

 > 
 > >0:     n
 > =:      y
 > 
 > >0:     n
 > =:      y


@@ -388,6 +403,12 @@
 > queue_running after or: y
 > first_delivery after or: y
 > 
 > queue_running after or: y
 > first_delivery after or: y
 > 

+> # acl expansion condition
+> acl if: Y:(0) [] []
+> acl if: Y:(1) [argY] []
+> acl if: N:(2) [argN] [arg2]
+> Failed: error from acl "a_defer"
+> 

 > # Default values for both if strings
 > 
 > ${if eq{1}{1}}  >true<
 > # Default values for both if strings
 > 
 > ${if eq{1}{1}}  >true<


@@ -543,7 +564,7 @@
 > " yes"                true      EXPECT: true
 > " no"                 false     EXPECT: false
 > "yes "                true      EXPECT: true
 > " yes"                true      EXPECT: true
 > " no"                 false     EXPECT: false
 > "yes "                true      EXPECT: true

-> Failed: unrecognised boolean value "-1"
+> "-1"                  true     EXPECT: true

 > "0"                   false     EXPECT: false
 > "1"                   true      EXPECT: true
 > " 0 "                 false     EXPECT: false
 > "0"                   false     EXPECT: false
 > "1"                   true      EXPECT: true
 > " 0 "                 false     EXPECT: false


@@ -553,6 +574,7 @@
 > " "                   false     EXPECT: false
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
 > " "                   false     EXPECT: false
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"

+> Failed: unrecognised boolean value "-text"

 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
 > "00"                  false     EXPECT: false
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
 > "00"                  false     EXPECT: false


@@ -862,3 +884,6 @@ xyz
 > match_ip:        15 
 > match_ip:        16 
 > 
 > match_ip:        15 
 > match_ip:        16 
 > 

+> in list
+> in list
+>