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/local/local.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/local/local.c')
| -rw-r--r-- | source4/torture/local/local.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 4a6c43761a..42fe94bc92 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -49,17 +49,34 @@ NTSTATUS torture_local_init(void) { int i; - TALLOC_CTX *mem_ctx = talloc_autofree_context(); + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "LOCAL"); + struct torture_suite *talloc_suite = torture_suite_create( + talloc_autofree_context(), + "TALLOC"); - register_torture_op("LOCAL-REPLACE", torture_local_replace); - register_torture_op("LOCAL-TALLOC", torture_local_talloc); - register_torture_op("LOCAL-CRYPTO-MD4", torture_local_crypto_md4); - register_torture_op("LOCAL-CRYPTO-MD5", torture_local_crypto_md5); - register_torture_op("LOCAL-CRYPTO-HMACMD5", torture_local_crypto_hmacmd5); - register_torture_op("LOCAL-CRYPTO-SHA1", torture_local_crypto_sha1); - register_torture_op("LOCAL-CRYPTO-HMACSHA1", torture_local_crypto_hmacsha1); + torture_local_talloc(talloc_suite); + torture_suite_add_suite(suite, talloc_suite); + torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace); + torture_suite_add_simple_test(suite, "CRYPTO-SHA1", + torture_local_crypto_sha1); + torture_suite_add_simple_test(suite, + "CRYPTO-MD4", torture_local_crypto_md4); + torture_suite_add_simple_test(suite, "CRYPTO-MD5", + torture_local_crypto_md5); + torture_suite_add_simple_test(suite, "CRYPTO-HMACMD5", + torture_local_crypto_hmacmd5); + torture_suite_add_simple_test(suite, "CRYPTO-HMACSHA1", + torture_local_crypto_hmacsha1); for (i = 0; suite_generators[i]; i++) - torture_register_suite(suite_generators[i](mem_ctx)); + torture_suite_add_suite(suite, + suite_generators[i](talloc_autofree_context())); + + suite->description = talloc_strdup(suite, + "Local, Samba-specific tests"); + + torture_register_suite(suite); return NT_STATUS_OK; } |