diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 13:06:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:12 -0500 |
commit | 8773e743c518578584d07d35ffdafdd598af88b0 (patch) | |
tree | 89726232dd6ae9eca1c219e21729a9b2336ddaa9 /source4/torture/torture.c | |
parent | 0f2347e417dec4a50f95d64353b260cd53a44a2b (diff) | |
download | samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.gz samba-8773e743c518578584d07d35ffdafdd598af88b0.tar.bz2 samba-8773e743c518578584d07d35ffdafdd598af88b0.zip |
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)
Diffstat (limited to 'source4/torture/torture.c')
-rw-r--r-- | source4/torture/torture.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c index c332f2286a..d5cb0511f7 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -31,13 +31,11 @@ _PUBLIC_ int torture_entries=1000; _PUBLIC_ int torture_failures=1; _PUBLIC_ int torture_seed=0; _PUBLIC_ int torture_numasync=100; -_PUBLIC_ BOOL use_oplocks; -_PUBLIC_ BOOL use_level_II_oplocks; -_PUBLIC_ BOOL torture_showall = False; +_PUBLIC_ bool torture_showall = false; struct torture_suite_list *torture_suites = NULL; -_PUBLIC_ NTSTATUS torture_register_suite(struct torture_suite *suite) +NTSTATUS torture_register_suite(struct torture_suite *suite) { struct torture_suite_list *p, *n; @@ -62,26 +60,7 @@ _PUBLIC_ NTSTATUS torture_register_suite(struct torture_suite *suite) } } - DLIST_ADD(torture_suites, n); - - return NT_STATUS_OK; -} - -static BOOL wrap_old_torture_fn(struct torture_context *torture, const void *_fn) -{ - BOOL (*fn)(struct torture_context *) = _fn; - return fn(torture); -} - - -/* Backwards compatibility wrapper */ -_PUBLIC_ NTSTATUS register_torture_op(const char *name, BOOL (*fn)(struct torture_context *)) -{ - struct torture_suite *suite; - suite = torture_suite_create(talloc_autofree_context(), name); - - torture_suite_add_simple_tcase(suite, name, wrap_old_torture_fn, fn); - torture_register_suite(suite); + DLIST_ADD_END(torture_suites, n, struct torture_suite_list *); return NT_STATUS_OK; } |