From 85abc86b214518b9b4d0728f3f0174bee0154c3c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 Sep 2005 17:42:12 +0000 Subject: r10514: Add str_list_make_shell() and str_list_join_shell() (This used to be commit 8b86a5da73d38764deb8c1f639322b2911736f97) --- source4/torture/SConscript | 2 +- source4/torture/config.mk | 3 +- source4/torture/local/util_strlist.c | 80 ++++++++++++++++++++++++++++++++++++ source4/torture/torture.c | 1 + 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 source4/torture/local/util_strlist.c (limited to 'source4/torture') diff --git a/source4/torture/SConscript b/source4/torture/SConscript index 6d939e874d..b471dd40b6 100644 --- a/source4/torture/SConscript +++ b/source4/torture/SConscript @@ -34,7 +34,7 @@ hostenv.StaticLibrary('torture_auth', [ 'auth/ntlmssp.c', 'auth/pac.c' ]) hostenv.StaticLibrary('torture_local', ['local/iconv.c', 'lib/talloc/testsuite.c', 'local/messaging.c', 'local/binding_string.c', 'local/idtree.c', 'local/socket.c', - 'local/irpc.c', 'local/resolve.c']) + 'local/irpc.c', 'local/resolve.c', 'local/util_strlist.c']) hostenv.StaticLibrary('torture_nbench', [ 'nbench/nbio.c', 'nbench/nbench.c' ]) diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 9e331f4736..12665c8e80 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -148,7 +148,8 @@ ADD_OBJ_FILES = \ torture/local/idtree.o \ torture/local/socket.o \ torture/local/irpc.o \ - torture/local/resolve.o + torture/local/resolve.o \ + torture/local/util_strlist.o REQUIRED_SUBSYSTEMS = \ LIBSMB \ MESSAGING diff --git a/source4/torture/local/util_strlist.c b/source4/torture/local/util_strlist.c new file mode 100644 index 0000000000..8c8d8dfcdb --- /dev/null +++ b/source4/torture/local/util_strlist.c @@ -0,0 +1,80 @@ +/* + Unix SMB/CIFS implementation. + + util_strlist testing + + Copyright (C) Jelmer Vernooij 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" + +static const char *test_lists_shell_strings[] = { + "", + "foo", + "foo bar", + "foo bar \"bla \"", + "foo \"\" bla", + "bla \"\"\"\" blie", +}; + +static BOOL test_lists_shell(TALLOC_CTX *mem_ctx) +{ + int i; + for (i = 0; test_lists_shell_strings[i]; i++) { + const char **ret1, **ret2, *tmp; + BOOL match = True; + + ret1 = str_list_make_shell(mem_ctx, test_lists_shell_strings[i]); + tmp = str_list_join_shell(mem_ctx, ret1); + ret2 = str_list_make_shell(mem_ctx, tmp); + + if ((ret1 == NULL || ret2 == NULL) && ret2 != ret1) { + match = False; + } else { + int j; + for (j = 0; ret1[j] && ret2[j]; j++) { + if (strcmp(ret1[j], ret2[j]) != 0) { + match = False; + break; + } + } + + if (ret1[j] || ret2[j]) + match = False; + } + + if (!match) { + printf("str_list_{make,join}_shell: Error double parsing, first run:\n%s\nSecond run: \n%s\n", + test_lists_shell_strings[i], + tmp); + return False; + } + } + + return True; +} + +BOOL torture_local_util_strlist(void) +{ + BOOL ret = True; + TALLOC_CTX *mem_ctx = talloc_init("test_util_strlist"); + + ret &= test_lists_shell(mem_ctx); + talloc_free(mem_ctx); + + return ret; +} diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 930a63bbb2..e4284d5ba0 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2321,6 +2321,7 @@ static struct { {"LOCAL-MESSAGING", torture_local_messaging, 0}, {"LOCAL-IRPC", torture_local_irpc, 0}, {"LOCAL-BINDING", torture_local_binding_string, 0}, + {"LOCAL-STRLIST", torture_local_util_strlist, 0}, {"LOCAL-IDTREE", torture_local_idtree, 0}, {"LOCAL-SOCKET", torture_local_socket, 0}, {"LOCAL-PAC", torture_pac, 0}, -- cgit