svn commit: samba r16332 - in branches/SAMBA_4_0/source/torture: . local

[jelmer at samba.org]

Author: jelmer
Date: 2006-06-17 01:20:02 +0000 (Sat, 17 Jun 2006)
New Revision: 16332

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16332

Log:
Fix two small bugs found by the buildfarm.

Modified:
   branches/SAMBA_4_0/source/torture/local/util_strlist.c
   branches/SAMBA_4_0/source/torture/ui.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/local/util_strlist.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/util_strlist.c	2006-06-17 01:12:28 UTC (rev 16331)
+++ branches/SAMBA_4_0/source/torture/local/util_strlist.c	2006-06-17 01:20:02 UTC (rev 16332)
@@ -68,7 +68,7 @@
 
 struct torture_suite *torture_local_util_strlist(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "util_strlist");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-STRLIST");
 	int i;
 
 	for (i = 0; test_lists_shell_strings[i]; i++) {

Modified: branches/SAMBA_4_0/source/torture/ui.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.c	2006-06-17 01:12:28 UTC (rev 16331)
+++ branches/SAMBA_4_0/source/torture/ui.c	2006-06-17 01:20:02 UTC (rev 16332)
@@ -137,6 +137,7 @@
 static BOOL internal_torture_run_test(struct torture_context *context, 
 					  struct torture_tcase *tcase,
 					  struct torture_test *test,
+					  BOOL already_setup,
 					  const void *tcase_data)
 {
 	BOOL ret;
@@ -148,7 +149,7 @@
 		return True;
 	}
 
-	if (!tcase_data && tcase->setup && !tcase->setup(context, &data))
+	if (!already_setup && tcase->setup && !tcase->setup(context, &data))
 		return False;
 
 	context->active_tcase = tcase;
@@ -160,7 +161,7 @@
 	context->last_reason = NULL;
 	context->last_result = TORTURE_OK;
 
-	ret = test->run(context, tcase->setup?data:tcase->data, test->data);
+	ret = test->run(context, !already_setup?data:tcase_data, test->data);
 
 	if (context->ui_ops->test_result)
 		context->ui_ops->test_result(context, context->last_result, 
@@ -179,7 +180,7 @@
 	context->active_test = NULL;
 	context->active_tcase = NULL;
 
-	if (!tcase_data && tcase->teardown && !tcase->teardown(context, data))
+	if (!already_setup && tcase->teardown && !tcase->teardown(context, data))
 		return False;
 
 	return ret;
@@ -204,7 +205,8 @@
 
 	for (test = tcase->tests; test; test = test->next) {
 		ret &= internal_torture_run_test(context, tcase, test, 
-									(tcase->setup?data:tcase->data));
+				tcase->fixture_persistent,
+				(tcase->setup?data:tcase->data));
 	}
 
 	if (tcase->fixture_persistent && tcase->teardown &&
@@ -224,7 +226,7 @@
 					  struct torture_tcase *tcase,
 					  struct torture_test *test)
 {
-	return internal_torture_run_test(context, tcase, test, NULL);
+	return internal_torture_run_test(context, tcase, test, False, NULL);
 }
 
 const char *torture_setting(struct torture_context *test, const char *name,