From a64a3dfa73b829669d838c8d129b0974360b95a5 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 12 Jun 2012 21:41:05 +0100 Subject: Change names to "listnamed" and "listcount". --- test/scripts/0000-Basic/0002 | 28 ++++++++++++++-------------- test/stdout/0002 | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index 41e0d0064..652891615 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -60,20 +60,20 @@ 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}}}} -list: ${list:dlist} -list: ${list:+dlist} -list: ${list:hlist} -list: ${list:elist} -list: ${list:flist} -list: ${list:nolist} -list: ${list_d:dlist} -list: ${list_d:hlist} -list: ${list_z:dlist} - -nlist: ${nlist:a:b:c} -nlist: ${nlist:} -nlist: ${nlist:<;a;b;c} -nlist: ${nlist:${list:dlist}} +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 diff --git a/test/stdout/0002 b/test/stdout/0002 index a7c876229..de67f99fc 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -49,20 +49,20 @@ > reduce: 6 > reduce: 9 > -> list: *.aa.bb : ^\Nxxx(.*) -> list: *.aa.bb : ^\Nxxx(.*) -> list: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch -> list: *.aa.bb : ^\Nxxx(.*) : ;; -> list: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664 +> 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 -> list: *.aa.bb : ^\Nxxx(.*) +> listnamed: *.aa.bb : ^\Nxxx(.*) > Failed: "hlist" is not a domain named list > Failed: bad suffix on "list" operator > -> nlist: 3 -> nlist: 0 -> nlist: 3 -> nlist: 2 +> listcount: 3 +> listcount: 0 +> listcount: 3 +> listcount: 2 > > # Tests with iscntrl() and illegal separators > -- cgit v1.2.3