Move subunit infrastructure code into lib/torture.

[kai/samba-autobuild/.git] / source4 / torture / local / local.c

diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 42fe94bc92269a8bb00e2b7a2aea03c2777ca3e2..1c3274adcda745368540d12c632ee4b6abfe150c 100644 (file)
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -5,7 +5,7 @@
    
    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 2 of the License, or
+   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,
@@ -14,14 +14,17 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "torture/torture.h"
+#include "torture/smbtorture.h"
 #include "torture/local/proto.h"
+#include "torture/ndr/ndr.h"
+#include "torture/ndr/proto.h"
 #include "torture/auth/proto.h"
+#include "lib/crypto/test_proto.h"
+#include "lib/registry/tests/proto.h"
 
 /* ignore me */ static struct torture_suite *
        (*suite_generators[]) (TALLOC_CTX *mem_ctx) =
@@ -32,17 +35,26 @@
        torture_local_irpc, 
        torture_local_util_strlist, 
        torture_local_util_file, 
+       torture_local_util_str, 
        torture_local_idtree, 
+       torture_local_genrand, 
        torture_local_iconv,
        torture_local_socket, 
+       torture_local_socket_wrapper, 
        torture_pac, 
-       torture_registry, 
        torture_local_resolve,
        torture_local_sddl,
        torture_local_ndr, 
+       torture_local_tdr, 
+       torture_local_share,
+       torture_local_loadparm,
+       torture_local_charset,
+       torture_local_compression,
        torture_local_event, 
        torture_local_torture,
        torture_local_dbspeed, 
+       torture_local_credentials,
+       torture_registry,
        NULL
 };
 
@@ -50,31 +62,28 @@ NTSTATUS torture_local_init(void)
 {
        int i;
        struct torture_suite *suite = torture_suite_create(
-                                                                               talloc_autofree_context(),
-                                                                               "LOCAL");
-       struct torture_suite *talloc_suite = torture_suite_create(
-                                                                                               talloc_autofree_context(),
-                                                                                               "TALLOC");
-
-       torture_local_talloc(talloc_suite);
-       torture_suite_add_suite(suite, talloc_suite);
+               talloc_autofree_context(),
+               "LOCAL");
+       
+       torture_suite_add_simple_test(suite, "TALLOC", torture_local_talloc);
        torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace);
+       
        torture_suite_add_simple_test(suite, "CRYPTO-SHA1", 
-                                                                 torture_local_crypto_sha1);
+                                     torture_local_crypto_sha1);
        torture_suite_add_simple_test(suite, 
-                                                                 "CRYPTO-MD4", torture_local_crypto_md4);
+                                     "CRYPTO-MD4", torture_local_crypto_md4);
        torture_suite_add_simple_test(suite, "CRYPTO-MD5", 
-                                                                 torture_local_crypto_md5);
+                                     torture_local_crypto_md5);
        torture_suite_add_simple_test(suite, "CRYPTO-HMACMD5", 
-                                                                 torture_local_crypto_hmacmd5);
+                                     torture_local_crypto_hmacmd5);
        torture_suite_add_simple_test(suite, "CRYPTO-HMACSHA1", 
-                                                                 torture_local_crypto_hmacsha1);
+                                     torture_local_crypto_hmacsha1);
        for (i = 0; suite_generators[i]; i++)
                torture_suite_add_suite(suite,
-                                               suite_generators[i](talloc_autofree_context()));
-
+                                       suite_generators[i](talloc_autofree_context()));
+       
        suite->description = talloc_strdup(suite, 
-                                                       "Local, Samba-specific tests");
+                                          "Local, Samba-specific tests");
 
        torture_register_suite(suite);