The branch, v4-0-test has been updated
via 4fc11bd97d6b65569742a7f1c695b7ecbc76919a (commit)
via 5b44d8121de7735d69e6238a1442aff034a8ebd3 (commit)
from 5f3a70f285ad8a412105c0e498e486f93fc279bc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 4fc11bd97d6b65569742a7f1c695b7ecbc76919a
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sun Apr 27 15:04:33 2008 +0100
Fix header locations.
commit 5b44d8121de7735d69e6238a1442aff034a8ebd3
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sun Apr 27 14:02:46 2008 +0100
Move subunit infrastructure code into lib/torture.
-----------------------------------------------------------------------
Summary of changes:
source/headermap.txt | 4 +-
source/lib/basic.mk | 1 +
source/lib/crypto/sha1test.c | 2 +-
source/lib/torture/config.mk | 11 +
source/lib/torture/torture.c | 579 ++++++++++++++++++++++++++++++++++
source/lib/torture/torture.h | 396 ++++++++++++++++++++++++
source/lib/util/tests/str.c | 2 +-
source/torture/basic/base.c | 2 +-
source/torture/basic/locking.c | 3 +-
source/torture/basic/misc.c | 2 +-
source/torture/config.mk | 17 +-
source/torture/ldap/common.c | 2 +-
source/torture/libnet/libnet.c | 2 +-
source/torture/local/dbspeed.c | 2 +-
source/torture/local/local.c | 2 +-
source/torture/nbench/nbench.c | 3 +-
source/torture/nbt/nbt.c | 2 +-
source/torture/ndr/ndr.c | 2 +-
source/torture/rap/rap.c | 2 +-
source/torture/raw/lookuprate.c | 2 +-
source/torture/raw/raw.c | 4 +-
source/torture/rpc/rpc.c | 2 +-
source/torture/rpc/rpc.h | 2 +-
source/torture/rpc/spoolss_notify.c | 1 -
source/torture/rpc/spoolss_win.c | 1 -
source/torture/smb2/smb2.c | 2 +-
source/torture/smbtorture.c | 2 +-
source/torture/smbtorture.h | 40 +++
source/torture/torture.h | 41 ---
source/torture/ui.c | 580 -----------------------------------
source/torture/ui.h | 396 ------------------------
source/torture/unix/unix.c | 2 +-
source/torture/util.h | 5 +
source/torture/util_smb.c | 1 -
source/torture/winbind/winbind.c | 2 +-
35 files changed, 1058 insertions(+), 1061 deletions(-)
create mode 100644 source/lib/torture/config.mk
create mode 100644 source/lib/torture/torture.c
create mode 100644 source/lib/torture/torture.h
create mode 100644 source/torture/smbtorture.h
delete mode 100644 source/torture/torture.h
delete mode 100644 source/torture/ui.c
delete mode 100644 source/torture/ui.h
Changeset truncated at 500 lines:
diff --git a/source/headermap.txt b/source/headermap.txt
index fbfc56e..bbd0d3c 100644
--- a/source/headermap.txt
+++ b/source/headermap.txt
@@ -44,7 +44,7 @@ rpc_server/common/common.h: dcerpc_server/common.h
libcli/auth/credentials.h: domain_credentials.h
lib/charset/charset.h: charset.h
libcli/ldap/ldap.h: ldap.h
-torture/torture.h: torture.h
+lib/torture/torture.h: torture.h
libcli/libcli.h: client.h
librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
@@ -60,7 +60,7 @@ lib/util/asn1.h: samba/asn1.h
libcli/util/error.h: core/error.h
lib/tdb_wrap.h: tdb_wrap.h
lib/ldb_wrap.h: ldb_wrap.h
-torture/ui.h: torture/ui.h
+torture/smbtorture.h: smbtorture.h
librpc/gen_ndr/winbind.h: gen_ndr/winbind.h
param/share.h: share.h
lib/util/util_tdb.h: util_tdb.h
diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 71acb94..e7e0ba8 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -16,6 +16,7 @@ mkinclude util/config.mk
mkinclude tdr/config.mk
mkinclude dbwrap/config.mk
mkinclude crypto/config.mk
+mkinclude torture/config.mk
[SUBSYSTEM::LIBCOMPRESSION]
diff --git a/source/lib/crypto/sha1test.c b/source/lib/crypto/sha1test.c
index 0e943bd..7777764 100644
--- a/source/lib/crypto/sha1test.c
+++ b/source/lib/crypto/sha1test.c
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-#include "torture/ui.h"
+#include "torture/torture.h"
#include "lib/crypto/crypto.h"
diff --git a/source/lib/torture/config.mk b/source/lib/torture/config.mk
new file mode 100644
index 0000000..e981ee0
--- /dev/null
+++ b/source/lib/torture/config.mk
@@ -0,0 +1,11 @@
+# TORTURE subsystem
+[LIBRARY::torture]
+PUBLIC_DEPENDENCIES = \
+ LIBSAMBA-HOSTCONFIG \
+ LIBSAMBA-UTIL \
+ LIBTALLOC
+
+PC_FILES += lib/torture/torture.pc
+torture_OBJ_FILES = $(addprefix lib/torture/, torture.o)
+
+PUBLIC_HEADERS += lib/torture/torture.h
diff --git a/source/lib/torture/torture.c b/source/lib/torture/torture.c
new file mode 100644
index 0000000..3f2c784
--- /dev/null
+++ b/source/lib/torture/torture.c
@@ -0,0 +1,579 @@
+/*
+ Unix SMB/CIFS implementation.
+ SMB torture UI functions
+
+ Copyright (C) Jelmer Vernooij 2006
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "lib/util/dlinklist.h"
+#include "param/param.h"
+#include "system/filesys.h"
+#include "auth/credentials/credentials.h"
+#include "lib/cmdline/popt_common.h"
+
+struct torture_context *torture_context_init(struct event_context *event_ctx,
+ const struct torture_ui_ops
*ui_ops)
+{
+ struct torture_context *torture = talloc_zero(event_ctx,
+ struct torture_context);
+ torture->ui_ops = ui_ops;
+ torture->returncode = true;
+ torture->ev = event_ctx;
+
+ if (ui_ops->init)
+ ui_ops->init(torture);
+
+ return torture;
+}
+
+/**
+ create a temporary directory.
+*/
+_PUBLIC_ NTSTATUS torture_temp_dir(struct torture_context *tctx,
+ const char *prefix,
+ char **tempdir)
+{
+ SMB_ASSERT(tctx->outputdir != NULL);
+
+ *tempdir = talloc_asprintf(tctx, "%s/%s.XXXXXX", tctx->outputdir,
+ prefix);
+ NT_STATUS_HAVE_NO_MEMORY(*tempdir);
+
+ if (mkdtemp(*tempdir) == NULL) {
+ return map_nt_error_from_unix(errno);
+ }
+
+ return NT_STATUS_OK;
+}
+
+void torture_comment(struct torture_context *context, const char *comment, ...)
+{
+ va_list ap;
+ char *tmp;
+
+ if (!context->ui_ops->comment)
+ return;
+
+ va_start(ap, comment);
+ tmp = talloc_vasprintf(context, comment, ap);
+
+ context->ui_ops->comment(context, tmp);
+
+ talloc_free(tmp);
+}
+
+void torture_warning(struct torture_context *context, const char *comment, ...)
+{
+ va_list ap;
+ char *tmp;
+
+ if (!context->ui_ops->warning)
+ return;
+
+ va_start(ap, comment);
+ tmp = talloc_vasprintf(context, comment, ap);
+
+ context->ui_ops->warning(context, tmp);
+
+ talloc_free(tmp);
+}
+
+void torture_result(struct torture_context *context,
+ enum torture_result result, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+
+ if (context->last_reason) {
+ torture_warning(context, "%s", context->last_reason);
+ talloc_free(context->last_reason);
+ }
+
+ context->last_result = result;
+ context->last_reason = talloc_vasprintf(context, fmt, ap);
+ va_end(ap);
+}
+
+struct torture_suite *torture_suite_create(TALLOC_CTX *ctx, const char *name)
+{
+ struct torture_suite *suite = talloc_zero(ctx, struct torture_suite);
+
+ suite->name = talloc_strdup(suite, name);
+ suite->testcases = NULL;
+ suite->children = NULL;
+
+ return suite;
+}
+
+void torture_tcase_set_fixture(struct torture_tcase *tcase,
+ bool (*setup) (struct torture_context *, void **),
+ bool (*teardown) (struct torture_context *, void *))
+{
+ tcase->setup = setup;
+ tcase->teardown = teardown;
+}
+
+static bool wrap_test_with_testcase_const(struct torture_context *torture_ctx,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+{
+ bool (*fn) (struct torture_context *,
+ const void *tcase_data,
+ const void *test_data);
+
+ fn = test->fn;
+
+ return fn(torture_ctx, tcase->data, test->data);
+}
+
+struct torture_test *torture_tcase_add_test_const(struct torture_tcase *tcase,
+ const char *name,
+ bool (*run) (struct torture_context *, const void *tcase_data,
+ const void *test_data),
+ const void *data)
+{
+ struct torture_test *test = talloc(tcase, struct torture_test);
+
+ test->name = talloc_strdup(test, name);
+ test->description = NULL;
+ test->run = wrap_test_with_testcase_const;
+ test->fn = run;
+ test->dangerous = false;
+ test->data = data;
+
+ DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+
+ return test;
+}
+
+
+bool torture_suite_init_tcase(struct torture_suite *suite,
+ struct torture_tcase *tcase,
+ const char *name)
+{
+ tcase->name = talloc_strdup(tcase, name);
+ tcase->description = NULL;
+ tcase->setup = NULL;
+ tcase->teardown = NULL;
+ tcase->fixture_persistent = true;
+ tcase->tests = NULL;
+
+ DLIST_ADD_END(suite->testcases, tcase, struct torture_tcase *);
+
+ return true;
+}
+
+
+struct torture_tcase *torture_suite_add_tcase(struct torture_suite *suite,
+ const char *name)
+{
+ struct torture_tcase *tcase = talloc(suite, struct torture_tcase);
+
+ if (!torture_suite_init_tcase(suite, tcase, name))
+ return NULL;
+
+ return tcase;
+}
+
+bool torture_run_suite(struct torture_context *context,
+ struct torture_suite *suite)
+{
+ bool ret = true;
+ struct torture_tcase *tcase;
+ struct torture_suite *tsuite;
+ char *old_testname;
+
+ context->level++;
+ if (context->ui_ops->suite_start)
+ context->ui_ops->suite_start(context, suite);
+
+ old_testname = context->active_testname;
+ if (old_testname != NULL)
+ context->active_testname = talloc_asprintf(context, "%s-%s",
+ old_testname,
suite->name);
+ else
+ context->active_testname = talloc_strdup(context, suite->name);
+
+ for (tcase = suite->testcases; tcase; tcase = tcase->next) {
+ ret &= torture_run_tcase(context, tcase);
+ }
+
+ for (tsuite = suite->children; tsuite; tsuite = tsuite->next) {
+ ret &= torture_run_suite(context, tsuite);
+ }
+
+ talloc_free(context->active_testname);
+ context->active_testname = old_testname;
+
+ if (context->ui_ops->suite_finish)
+ context->ui_ops->suite_finish(context, suite);
+
+ context->level--;
+
+ return ret;
+}
+
+void torture_ui_test_start(struct torture_context *context,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+{
+ if (context->ui_ops->test_start)
+ context->ui_ops->test_start(context, tcase, test);
+}
+
+int str_list_match(const char *name, char **list)
+{
+ int i, ret = 0;
+ if (list == NULL)
+ return 0;
+
+ for (i = 0; list[i]; i++) {
+ if (gen_fnmatch(list[i], name) == 0)
+ ret++;
+ }
+ return ret;
+}
+
+void torture_ui_test_result(struct torture_context *context,
+ enum torture_result result,
+ const char *comment)
+{
+ if (context->ui_ops->test_result)
+ context->ui_ops->test_result(context, result, comment);
+
+ if (result == TORTURE_ERROR || result == TORTURE_FAIL)
+ context->returncode = false;
+}
+
+static bool internal_torture_run_test(struct torture_context *context,
+ struct torture_tcase *tcase,
+ struct torture_test *test,
+ bool already_setup)
+{
+ bool success;
+ char *old_testname;
+
+ if (tcase == NULL || strcmp(test->name, tcase->name) != 0) {
+ old_testname = context->active_testname;
+ context->active_testname = talloc_asprintf(context, "%s-%s",
old_testname, test->name);
+ }
+
+ context->active_tcase = tcase;
+ context->active_test = test;
+
+ torture_ui_test_start(context, tcase, test);
+
+ context->last_reason = NULL;
+ context->last_result = TORTURE_OK;
+
+ if (!already_setup && tcase->setup &&
+ !tcase->setup(context, &(tcase->data))) {
+ if (context->last_reason == NULL)
+ context->last_reason = talloc_strdup(context, "Setup
failure");
+ context->last_result = TORTURE_ERROR;
+ success = false;
+ } else if (test->dangerous &&
+ !torture_setting_bool(context, "dangerous", false)) {
+ context->last_result = TORTURE_SKIP;
+ context->last_reason = talloc_asprintf(context,
+ "disabled %s - enable dangerous tests to use", test->name);
+ success = true;
+ } else {
+ success = test->run(context, tcase, test);
+
+ if (!success && context->last_result == TORTURE_OK) {
+ if (context->last_reason == NULL)
+ context->last_reason = talloc_strdup(context,
"Unknown error/failure");
+ context->last_result = TORTURE_ERROR;
+ }
+ }
+
+ if (!already_setup && tcase->teardown && !tcase->teardown(context,
tcase->data)) {
+ if (context->last_reason == NULL)
+ context->last_reason = talloc_strdup(context, "Setup
failure");
+ context->last_result = TORTURE_ERROR;
+ success = false;
+ }
+
+ torture_ui_test_result(context, context->last_result,
+ context->last_reason);
+
+ talloc_free(context->last_reason);
+
+ if (tcase == NULL || strcmp(test->name, tcase->name) != 0) {
+ talloc_free(context->active_testname);
+ context->active_testname = old_testname;
+ }
+ context->active_test = NULL;
+ context->active_tcase = NULL;
+
+ return success;
+}
+
+bool torture_run_tcase(struct torture_context *context,
+ struct torture_tcase *tcase)
+{
+ bool ret = true;
+ char *old_testname;
+ struct torture_test *test;
+
+ context->level++;
+
+ context->active_tcase = tcase;
+ if (context->ui_ops->tcase_start)
+ context->ui_ops->tcase_start(context, tcase);
+
+ if (tcase->fixture_persistent && tcase->setup
+ && !tcase->setup(context, &tcase->data)) {
+ /* FIXME: Use torture ui ops for reporting this error */
+ fprintf(stderr, "Setup failed: ");
+ if (context->last_reason != NULL)
+ fprintf(stderr, "%s", context->last_reason);
+ fprintf(stderr, "\n");
+ ret = false;
+ goto done;
+ }
+
+ old_testname = context->active_testname;
+ context->active_testname = talloc_asprintf(context, "%s-%s",
+ old_testname, tcase->name);
+ for (test = tcase->tests; test; test = test->next) {
+ ret &= internal_torture_run_test(context, tcase, test,
+ tcase->fixture_persistent);
+ }
+ talloc_free(context->active_testname);
+ context->active_testname = old_testname;
+
+ if (tcase->fixture_persistent && tcase->teardown &&
+ !tcase->teardown(context, tcase->data))
+ ret = false;
+
+done:
+ context->active_tcase = NULL;
+
+ if (context->ui_ops->tcase_finish)
+ context->ui_ops->tcase_finish(context, tcase);
+
+ context->level--;
+
+ return ret;
+}
+
+bool torture_run_test(struct torture_context *context,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+{
+ return internal_torture_run_test(context, tcase, test, false);
+}
+
+int torture_setting_int(struct torture_context *test, const char *name,
+ int default_value)
+{
+ return lp_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
+}
+
+double torture_setting_double(struct torture_context *test, const char *name,
+ double default_value)
+{
+ return lp_parm_double(test->lp_ctx, NULL, "torture", name,
default_value);
+}
+
+bool torture_setting_bool(struct torture_context *test, const char *name,
+ bool default_value)
+{
+ return lp_parm_bool(test->lp_ctx, NULL, "torture", name, default_value);
+}
+
+const char *torture_setting_string(struct torture_context *test,
+ const char *name,
+ const char *default_value)
+{
+ const char *ret;
+
+ SMB_ASSERT(test != NULL);
+ SMB_ASSERT(test->lp_ctx != NULL);
+
+ ret = lp_parm_string(test->lp_ctx, NULL, "torture", name);
+
+ if (ret == NULL)
+ return default_value;
+
+ return ret;
+}
+
+static bool wrap_test_with_simple_tcase_const (
+ struct torture_context *torture_ctx,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+{
+ bool (*fn) (struct torture_context *, const void *tcase_data);
+
+ fn = test->fn;
+
+ return fn(torture_ctx, test->data);
+}
--
Samba Shared Repository
