From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/local/util_strlist.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'source4/torture/local/util_strlist.c') diff --git a/source4/torture/local/util_strlist.c b/source4/torture/local/util_strlist.c index 65f8bc914a..7dbb5f8ce6 100644 --- a/source4/torture/local/util_strlist.c +++ b/source4/torture/local/util_strlist.c @@ -33,15 +33,17 @@ static const char *test_lists_shell_strings[] = { NULL }; -static BOOL test_lists_shell(struct torture_context *test, const void *_data) +static bool test_lists_shell(struct torture_context *tctx, + const void *test_data) { - const char *data = _data; + const char *data = test_data; const char **ret1, **ret2, *tmp; BOOL match = True; + TALLOC_CTX *mem_ctx = tctx; - ret1 = str_list_make_shell(test, data, " "); - tmp = str_list_join_shell(test, ret1, ' '); - ret2 = str_list_make_shell(test, tmp, " "); + ret1 = str_list_make_shell(mem_ctx, data, " "); + 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; @@ -58,17 +60,14 @@ static BOOL test_lists_shell(struct torture_context *test, const void *_data) match = False; } - if (!match) { - torture_fail(test, "str_list_{make,join}_shell: Error double parsing, first run:\n%s\nSecond run: \n%s", data, tmp); - return False; - } - - return True; + torture_assert(tctx, match, talloc_asprintf(tctx, + "str_list_{make,join}_shell: Error double parsing, first run:\n%s\nSecond run: \n%s", data, tmp)); + return true; } struct torture_suite *torture_local_util_strlist(TALLOC_CTX *mem_ctx) { - struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-STRLIST"); + struct torture_suite *suite = torture_suite_create(mem_ctx, "STRLIST"); int i; for (i = 0; test_lists_shell_strings[i]; i++) { -- cgit