projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another fix for nmem_strsplit_escape
[yaz-moved-to-github.git]
/
test
/
test_nmem.c
diff --git
a/test/test_nmem.c
b/test/test_nmem.c
index
b2a0b7b
..
1fac283
100644
(file)
--- a/
test/test_nmem.c
+++ b/
test/test_nmem.c
@@
-96,16
+96,16
@@
void tst_nmem_strsplit(void)
YAZ_CHECK(num > 2 && !strcmp(array[2], "b,"));
YAZ_CHECK(num > 3 && !strcmp(array[3], "cd"));
YAZ_CHECK(num > 2 && !strcmp(array[2], "b,"));
YAZ_CHECK(num > 3 && !strcmp(array[3], "cd"));
- nmem_strsplit_escape(nmem, ",", "\\,a,b\\,,cd", &array, &num, 0, '\\');
+ nmem_strsplit_escape(nmem, ",", "\\,a,b\\,,c\\d", &array, &num, 0, '\\');
YAZ_CHECK(num == 3);
YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
YAZ_CHECK(num > 1 && !strcmp(array[1], "b,"));
YAZ_CHECK(num > 2 && !strcmp(array[2], "cd"));
YAZ_CHECK(num == 3);
YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
YAZ_CHECK(num > 1 && !strcmp(array[1], "b,"));
YAZ_CHECK(num > 2 && !strcmp(array[2], "cd"));
- nmem_strsplit_escape(nmem, ",", "\\,a,b\\,\\,cd", &array, &num, 0, '\\');
+ nmem_strsplit_escape(nmem, ",", "\\,a,b\\,\\,c\\\\\\|d", &array, &num, 0, '\\');
YAZ_CHECK(num == 2);
YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
YAZ_CHECK(num == 2);
YAZ_CHECK(num > 0 && !strcmp(array[0], ",a"));
- YAZ_CHECK(num > 1 && !strcmp(array[1], "b,,cd"));
+ YAZ_CHECK(num > 1 && !strcmp(array[1], "b,,c\\|d"));
nmem_destroy(nmem);
}
nmem_destroy(nmem);
}
@@
-113,6
+113,7
@@
void tst_nmem_strsplit(void)
int main (int argc, char **argv)
{
YAZ_CHECK_INIT(argc, argv);
int main (int argc, char **argv)
{
YAZ_CHECK_INIT(argc, argv);
+ YAZ_CHECK_LOG();
tst_nmem_malloc();
tst_nmem_strsplit();
YAZ_CHECK_TERM;
tst_nmem_malloc();
tst_nmem_strsplit();
YAZ_CHECK_TERM;