Author: jelmer Date: 2007-11-13 04:57:09 +0000 (Tue, 13 Nov 2007) New Revision: 25935
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25935 Log: Fix registry tests. Modified: branches/SAMBA_4_0/ 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:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2007-11-13 04:32:36 UTC (rev 25934) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2007-11-13 04:57:09 UTC (rev 25935) @@ -92,10 +92,9 @@ # End BINARY regtree ################################################ -[MODULE::TORTURE_REGISTRY] -SUBSYSTEM = torture -INIT_FUNCTION = torture_registry_init +[SUBSYSTEM::torture_registry] PRIVATE_DEPENDENCIES = registry +PRIVATE_PROTO_HEADER = tests/proto.h OBJ_FILES = \ tests/generic.o \ tests/hive.o \ Modified: branches/SAMBA_4_0/source/lib/registry/tests/generic.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tests/generic.c 2007-11-13 04:32:36 UTC (rev 25934) +++ branches/SAMBA_4_0/source/lib/registry/tests/generic.c 2007-11-13 04:57:09 UTC (rev 25935) @@ -111,9 +111,9 @@ return true; } -_PUBLIC_ NTSTATUS torture_registry_init(void) +_PUBLIC_ struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "LOCAL-REGISTRY"); + struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY"); torture_suite_add_simple_test(suite, "str_regtype", test_str_regtype); torture_suite_add_simple_test(suite, "reg_val_data_string dword", @@ -133,7 +133,5 @@ torture_suite_add_suite(suite, torture_registry_registry(suite)); torture_suite_add_suite(suite, torture_registry_diff(suite)); - torture_register_suite(suite); - - return NT_STATUS_OK; + return suite; } Modified: branches/SAMBA_4_0/source/torture/local/config.mk =================================================================== --- branches/SAMBA_4_0/source/torture/local/config.mk 2007-11-13 04:32:36 UTC (rev 25934) +++ branches/SAMBA_4_0/source/torture/local/config.mk 2007-11-13 04:57:09 UTC (rev 25935) @@ -41,6 +41,7 @@ TORTURE_AUTH \ TORTURE_UTIL \ TORTURE_NDR \ - share + share \ + torture_registry # 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-13 04:32:36 UTC (rev 25934) +++ branches/SAMBA_4_0/source/torture/local/local.c 2007-11-13 04:57:09 UTC (rev 25935) @@ -24,6 +24,7 @@ #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) = @@ -51,6 +52,7 @@ torture_local_event, torture_local_torture, torture_local_dbspeed, + torture_registry, NULL };
