svn commit: samba r25928 - in branches/SAMBA_4_0: . source/lib source/lib/registry source/lib/registry/tests source/torture/local

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-11 23:36:53 +0000 (Sun, 11 Nov 2007)
New Revision: 25928

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

Log:
Split up torture-local a bit.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/registry/config.mk
   branches/SAMBA_4_0/source/lib/registry/tests/generic.c
   branches/SAMBA_4_0/source/torture/local/config.mk
   branches/SAMBA_4_0/source/torture/local/local.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2007-11-11 23:36:50 UTC (rev 25927)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2007-11-11 23:36:53 UTC (rev 25928)
@@ -31,6 +31,16 @@
 # End SUBSYSTEM LIBCRYPTO
 ##############################
 
+[MODULE::TORTURE_LIBCRYPTO]
+OBJ_FILES = \
+		crypto/md4test.o \
+		crypto/md5test.o \
+		crypto/hmacmd5test.o \
+		crypto/sha1test.o \
+		crypto/hmacsha1test.o
+SUBSYSTEM = torture
+PRIVATE_DEPENDENCIES = LIBCRYPTO
+
 ################################################
 # Start SUBSYSTEM LIBCOMPRESSION
 [SUBSYSTEM::LIBCOMPRESSION]

Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/config.mk	2007-11-11 23:36:50 UTC (rev 25927)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk	2007-11-11 23:36:53 UTC (rev 25928)
@@ -91,3 +91,13 @@
 MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################
+
+[MODULE::TORTURE_REGISTRY]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_registry_init
+PRIVATE_DEPENDENCIES = registry
+OBJ_FILES = \
+		tests/generic.o \
+		tests/hive.o \
+		tests/diff.o \
+		tests/registry.o

Modified: branches/SAMBA_4_0/source/lib/registry/tests/generic.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tests/generic.c	2007-11-11 23:36:50 UTC (rev 25927)
+++ branches/SAMBA_4_0/source/lib/registry/tests/generic.c	2007-11-11 23:36:53 UTC (rev 25928)
@@ -112,11 +112,9 @@
 	return true;
 }
 
-
-
-struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx)
+_PUBLIC_ NTSTATUS torture_registry_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "REGISTRY");
 	torture_suite_add_simple_test(suite, "str_regtype",
 				      test_str_regtype);
 	torture_suite_add_simple_test(suite, "reg_val_data_string dword",
@@ -132,9 +130,11 @@
 	torture_suite_add_simple_test(suite, "reg_val_description null",
 				      test_reg_val_description_nullname);
 
-	torture_suite_add_suite(suite, torture_registry_hive(mem_ctx));
-	torture_suite_add_suite(suite, torture_registry_registry(mem_ctx));
-	torture_suite_add_suite(suite, torture_registry_diff(mem_ctx));
+	torture_suite_add_suite(suite, torture_registry_hive(suite));
+	torture_suite_add_suite(suite, torture_registry_registry(suite));
+	torture_suite_add_suite(suite, torture_registry_diff(suite));
 
-	return suite;
+	torture_register_suite(suite);
+	
+	return NT_STATUS_OK;
 }

Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/local/config.mk	2007-11-11 23:36:50 UTC (rev 25927)
+++ branches/SAMBA_4_0/source/torture/local/config.mk	2007-11-11 23:36:53 UTC (rev 25928)
@@ -7,11 +7,6 @@
 		proto.h
 OBJ_FILES = \
 		../../lib/charset/tests/iconv.o \
-		../../lib/crypto/md4test.o \
-		../../lib/crypto/md5test.o \
-		../../lib/crypto/hmacmd5test.o \
-		../../lib/crypto/sha1test.o \
-		../../lib/crypto/hmacsha1test.o \
 		../../lib/talloc/testsuite.o \
 		../../lib/replace/test/os2_delete.o \
 		../../lib/replace/test/strptime.o \
@@ -22,17 +17,13 @@
 		../../lib/util/tests/idtree.o \
 		../../lib/socket/testsuite.o \
 		../../lib/socket_wrapper/testsuite.o \
-		../../lib/registry/tests/generic.o \
-		../../lib/registry/tests/hive.o \
-		../../lib/registry/tests/diff.o \
-		../../lib/registry/tests/registry.o \
 		../../libcli/resolve/testsuite.o \
 		../../lib/util/tests/strlist.o \
 		../../lib/util/tests/str.o \
 		../../lib/util/tests/file.o \
 		../../lib/util/tests/genrand.o \
 		../../lib/compression/testsuite.o \
-		../../lib/charset/testsuite.o \
+		../../lib/charset/tests/charset.o \
 		../../libcli/security/tests/sddl.o \
 		../../lib/tdr/testsuite.o \
 		../../lib/events/testsuite.o \
@@ -46,8 +37,6 @@
 		LIBCLI_SMB \
 		MESSAGING \
 		ICONV \
-		registry \
-		LIBCRYPTO \
 		POPT_CREDENTIALS \
 		TORTURE_AUTH \
 		TORTURE_UTIL \
@@ -55,4 +44,3 @@
 		share
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
-

Modified: branches/SAMBA_4_0/source/torture/local/local.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/local.c	2007-11-11 23:36:50 UTC (rev 25927)
+++ branches/SAMBA_4_0/source/torture/local/local.c	2007-11-11 23:36:53 UTC (rev 25928)
@@ -40,7 +40,6 @@
 	torture_local_socket, 
 	torture_local_socket_wrapper, 
 	torture_pac, 
-	torture_registry, 
 	torture_local_resolve,
 	torture_local_sddl,
 	torture_local_ndr,