diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-06-12 21:43:58 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-06-12 21:43:58 +0100 |
| commit | 585121e2682545b7afa599e039a7a1e2b1804570 (patch) | |
| tree | b4074602a1cc3b876fee896d6d5446e4548d51a6 /test | |
| parent | d7148a072a5fee80ffa8d1aeebf9bc05d0e903b4 (diff) | |
| parent | a64a3dfa73b829669d838c8d129b0974360b95a5 (diff) | |
Merge branch 'lists'
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0002 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0002 | 15 | ||||
| -rw-r--r-- | test/stdout/0002 | 15 |
3 files changed, 32 insertions, 0 deletions
diff --git a/test/confs/0002 b/test/confs/0002 index af680500c..6983fd87f 100644 --- a/test/confs/0002 +++ b/test/confs/0002 @@ -15,6 +15,8 @@ gecos_name = CALLER_NAME # ----- Main settings ----- domainlist dlist = *.aa.bb : ^\Nxxx(.*) +domainlist elist = +dlist : ;; +domainlist flist = <; a ; b;;c ; +elist ; 2001:630:212:8:204::b664 ; hostlist hlist = V4NET.11.12.13 : iplsearch;DIR/aux-fixed/0002.iplsearch headers_charset = iso-8859-8 diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index 3b485ee97..652891615 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -60,6 +60,21 @@ 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}}}} +listnamed: ${listnamed:dlist} +listnamed: ${listnamed:+dlist} +listnamed: ${listnamed:hlist} +listnamed: ${listnamed:elist} +listnamed: ${listnamed:flist} +listnamed: ${listnamed:nolist} +listnamed: ${listnamed_d:dlist} +listnamed: ${listnamed_d:hlist} +listnamed: ${listnamed_z:dlist} + +listcount: ${listcount:a:b:c} +listcount: ${listcount:} +listcount: ${listcount:<;a;b;c} +listcount: ${listcount:${listnamed:dlist}} + # Tests with iscntrl() and illegal separators map: ${map{<\n a\n\nb\nc}{'$item'}} diff --git a/test/stdout/0002 b/test/stdout/0002 index 2acfb63ea..de67f99fc 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -49,6 +49,21 @@ > reduce: 6 > reduce: 9 > +> listnamed: *.aa.bb : ^\Nxxx(.*) +> listnamed: *.aa.bb : ^\Nxxx(.*) +> listnamed: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch +> listnamed: *.aa.bb : ^\Nxxx(.*) : ;; +> listnamed: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664 +> Failed: "nolist" is not a named list +> listnamed: *.aa.bb : ^\Nxxx(.*) +> Failed: "hlist" is not a domain named list +> Failed: bad suffix on "list" operator +> +> listcount: 3 +> listcount: 0 +> listcount: 3 +> listcount: 2 +> > # Tests with iscntrl() and illegal separators > > map: 'a' |