X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9aa35e9ce70bb9bf61e4e4dbc7089e49eeded1b3..640f7e0adeba7320037eb76a697563d0bb257ac3:/test/scripts/0000-Basic/0002?ds=sidebyside diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index 105134da3..27bf70806 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -23,6 +23,7 @@ primary_hostname: ${primary_hostname} qualify_domain: $qualify_domain bounce_return_size_limit: ${bounce_return_size_limit} spool_directory: $spool_directory +queue_name: $queue_name unknown: ${unknown} h_subject: $h_subject:(should be empty) h_subject:$h_subject (should be empty) @@ -62,6 +63,8 @@ reduce: "${reduce{}{+}{$value$item}}" reduce: ${reduce{a:b:c}{+}{$value$item}} reduce: ${reduce {<, 1,2,3}{0}{${eval:$value+$item}}} reduce: ${reduce {3:0:9:4:6}{0}{${if >{$item}{$value}{$item}{$value}}}} +# Check for extract corrupting reduce's $value +reduce: ${reduce {b}{a aaa}{${extract{1}{ }{$value}} , $item}} listnamed: ${listnamed:dlist} listnamed: ${listnamed:+dlist} @@ -130,8 +133,11 @@ addresses: ${addresses:>+ Exim Person (that's me),\ addresses: ${addresses:Exim Person (that's me), \ xyz@abc, nullgroupname:;, group: p@q, r@s; } addresses: ${addresses:local-part@dom.ain } +addresses: ${addresses:>} + +escape: ${escape:B7·F2ò} +excape8bit: ${escape8bit:undisturbed text\ttab\nnewline\ttab\\backslash \176tilde\177DEL\200\x81.} -escape: ${escape:B7·F2ò} eval: ${eval:1+1} eval: ${eval:1+2*3} eval: ${eval:(1+2)*3} @@ -178,7 +184,21 @@ hex2b64:${hex2b64:1a2b3c4d5e6g} hex2b64:${hex2b64:${md5:the quick brown fox}} hex2b64:${hex2b64:${sha1:the quick brown fox}} -The base62 operator is actually a base36 operator in the Darwin and Cygwin +base32: 0 <${base32:0}> +base32: 1 <${base32:1}> +base32: 31 <${base32:31}> +base32: 32 <${base32:32}> +base32: 42 <${base32:42}> +base32 error: 0x1 ${base32:0x1} + +base32d: 0 ${base32d:${base32:0}} +base32d: 1 ${base32d:${base32:1}} +base32d: 31 ${base32d:${base32:31}} +base32d: 32 ${base32d:${base32:32}} +base32d: 42 ${base32d:${base32:42}} +base32d error: ABC ${base32d:ABC} + +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. @@ -398,6 +418,8 @@ gei: ${if gei{ABC}{abc}{y}{n}} isip: ${if isip {1.2.3.4}{y}{n}} 1.2.3.4 isip4: ${if isip4{1.2.3.4}{y}{n}} 1.2.3.4 isip6: ${if isip6{1.2.3.4}{y}{n}} 1.2.3.4 +isip: ${if isip {::1.2.3.256}{y}{n}} ::1.2.3.256 +isip4: ${if isip4{1.2.3.256}{y}{n}} 1.2.3.256 isip: ${if isip {1:2:3:4}{y}{n}} 1:2:3:4 isip4: ${if isip4{1:2:3:4}{y}{n}} 1:2:3:4 isip6: ${if isip6{1:2:3:4}{y}{n}} 1:2:3:4 @@ -407,6 +429,7 @@ isip6: ${if isip6{::1}{y}{n}} ::1 isip: ${if isip {fe80::a00:20ff:fe86:a061}{y}{n}} fe80::a00:20ff:fe86:a061 isip4: ${if isip4{fe80::a00:20ff:fe86:a061}{y}{n}} fe80::a00:20ff:fe86:a061 isip6: ${if isip6{fe80::a00:20ff:fe86:a061}{y}{n}} fe80::a00:20ff:fe86:a061 +isip: ${if isip {fe80::1.2.3.4}{y}{n}} fe80::1.2.3.4 isip: ${if isip {rhubarb}{y}{n}} rhubarb isip4: ${if isip4{rhubarb}{y}{n}} rhubarb isip6: ${if isip6{rhubarb}{y}{n}} rhubarb @@ -508,8 +531,8 @@ abc: ${lookup{abc}wildlsearch{DIR/aux-var/0002.wild}} a.b.c: ${lookup{a.b.c}wildlsearch{DIR/aux-var/0002.wild}} ab.c: ${lookup{ab.c}wildlsearch{DIR/aux-var/0002.wild}} xyz: ${lookup{xyz}wildlsearch{DIR/aux-var/0002.wild}} -Xyz: ${lookup{Xyz}wildlsearch{DIR/aux-var/0002.wild}} -Zyz: ${lookup{Zyz}wildlsearch{DIR/aux-var/0002.wild}} +.Xyz: ${lookup{Xyz}wildlsearch{DIR/aux-var/0002.wild}} +.Zyz: ${lookup{Zyz}wildlsearch{DIR/aux-var/0002.wild}} a b: ${lookup{a b}wildlsearch{DIR/aux-var/0002.wild}} a b: ${lookup{a b}wildlsearch{DIR/aux-var/0002.wild}} a:b: ${lookup{a:b}wildlsearch{DIR/aux-var/0002.wild}} @@ -524,8 +547,8 @@ abc: ${lookup{abc}nwildlsearch{DIR/aux-var/0002.wild}} a.b.c: ${lookup{a.b.c}nwildlsearch{DIR/aux-var/0002.wild}} ab.c: ${lookup{ab.c}nwildlsearch{DIR/aux-var/0002.wild}} xyz: ${lookup{xyz}nwildlsearch{DIR/aux-var/0002.wild}} -Xyz: ${lookup{Xyz}nwildlsearch{DIR/aux-var/0002.wild}} -Zyz: ${lookup{Zyz}nwildlsearch{DIR/aux-var/0002.wild}} +.Xyz: ${lookup{Xyz}nwildlsearch{DIR/aux-var/0002.wild}} +.Zyz: ${lookup{Zyz}nwildlsearch{DIR/aux-var/0002.wild}} a b: ${lookup{a b}nwildlsearch{DIR/aux-var/0002.wild}} a b: ${lookup{a b}nwildlsearch{DIR/aux-var/0002.wild}} a:b: ${lookup{a:b}nwildlsearch{DIR/aux-var/0002.wild}} @@ -544,10 +567,10 @@ a\\:Xb: ${lookup{a\\:Xb}nwildlsearch{DIR/aux-var/0002.wild}} # Some tests of case-(in)dependence -MiXeD-CD: ${lookup{MiXeD-CD}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} -MixeD-CD: ${lookup{MixeD-CD}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} -MiXeD-Ncd: ${lookup{MiXeD-Ncd}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} -MixeD-Ncd: ${lookup{MixeD-Ncd}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} +.MiXeD-CD: ${lookup{MiXeD-CD}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} +.MixeD-CD: ${lookup{MixeD-CD}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} +.MiXeD-Ncd: ${lookup{MiXeD-Ncd}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} +.MixeD-Ncd: ${lookup{MixeD-Ncd}nwildlsearch{DIR/aux-var/0002.wild}{$value}{NOT FOUND}} # IP address (CIDR) lookups @@ -591,12 +614,12 @@ ${extract{B}{A=1 B=2 C=3}} ${extract{ B }{A=1 B=2 C=3}{$value}{NOT FOUND}} ${extract{2}{:}{1:2:3}} ${extract{ 2 }{:}{1:2:3}{$value}{NOT FOUND}} -Empty:<${extract{D}{A=1 B=2 C=3}}> -Empty:<${extract{4}{:}{1:2:3}}> +empty:<${extract{D}{A=1 B=2 C=3}}> +empty:<${extract{4}{:}{1:2:3}}> ${extract{C}{A=1 B=2 C=3}{<$value>}} ${extract{3}{:}{1:2:3}{<$value>}} -Empty:<${extract{Z}{A=1 B=2 C=3}{<$value>}}> -Empty:<${extract{4}{:}{1:2:3}{<$value>}}> +empty:<${extract{Z}{A=1 B=2 C=3}{<$value>}}> +empty:<${extract{4}{:}{1:2:3}{<$value>}}> ${extract{Z}{A=1 B=2 C=3}{<$value>}{no Z}} ${extract{4}{:}{1:2:3}{<$value>}{no 4}} ${extract{Z}{A=1 B=2 C=3}{<$value>}fail} @@ -615,6 +638,10 @@ ${extract{}{X=3}} ${extract{ }{X=3}} ${extract{ 2 }{ }{a b c}} +${map{a,1:b,2:c,3}{${extract{1}{,}{$item}{$value}{}}}} +${map{a,1:b,2:c,3}{${extract{1}{,}{$item}{$value}{failcase}{bogus_argument}}}} +${map{a,1:b,2:c,3}{${extract{1}{,}{$item}{$value}fail}}} + # Translation abcdea aaa xyz ${tr{abcdea}{aaa}{xyz}} @@ -671,8 +698,8 @@ abcdea abc z ${tr{abcdea}{abc}{z}} abcd ${rfc2047:abcd} <:abcd:> ${rfc2047:<:abcd:>} <:ab cd:> ${rfc2047:<:ab cd:>} -Long: ${rfc2047: here we go: a string that is going to be encoded: it will go over the 75-char limit} -Long: ${rfc2047: here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit} +long: ${rfc2047: here we go: a string that is going to be encoded: it will go over the 75-char limit} +long: ${rfc2047: here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit} # RFC 2047 decode @@ -712,21 +739,21 @@ ${if exists{/non/exist/file}{${readfile{/non/exist/file}}}{non-exist}} # Calling a command ${run{DIR/aux-fixed/0002.runfile 0}} -RC=$runrc +rc=$runrc ${run{DIR/aux-fixed/0002.runfile 0}{1}{2}} -RC=$runrc +rc=$runrc ${run{DIR/aux-fixed/0002.runfile 0}{$value}{2}} -RC=$runrc +rc=$runrc ${run{DIR/aux-fixed/0002.runfile 1}{$value}{2}} -RC=$runrc +rc=$runrc ${run{DIR/aux-fixed/0002.runfile 1}{$value}{$value}} -RC=$runrc +rc=$runrc ${run{DIR/test-nonexist}{Y}{N}} -RC=$runrc +rc=$runrc >>${run{DIR/bin/iefbr14}}<< -RC=$runrc +rc=$runrc ${if eq{1}{2}{${run{/non/exist}}}{1!=2}} -RC=$runrc +rc=$runrc # PRVS