diff options
| -rw-r--r-- | source4/lib/basic.mk | 10 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 10 | ||||
| -rw-r--r-- | source4/lib/registry/tests/generic.c | 16 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 14 | ||||
| -rw-r--r-- | source4/torture/local/local.c | 1 |
5 files changed, 29 insertions, 22 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 0fc07bcd89..aa1a5df19c 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -31,6 +31,16 @@ OBJ_FILES = \ # 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] diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 670410ff6a..6e8f8917d4 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -91,3 +91,13 @@ PRIVATE_DEPENDENCIES = \ 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 diff --git a/source4/lib/registry/tests/generic.c b/source4/lib/registry/tests/generic.c index 1b680f20b7..69146186dc 100644 --- a/source4/lib/registry/tests/generic.c +++ b/source4/lib/registry/tests/generic.c @@ -112,11 +112,9 @@ static bool test_reg_val_description_nullname(struct torture_context *ctx) 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 @@ struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx) 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; } diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 987029e7e9..d6414670bf 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -7,11 +7,6 @@ PRIVATE_PROTO_HEADER = \ 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 @@ OBJ_FILES = \ ../../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 @@ PRIVATE_DEPENDENCIES = \ LIBCLI_SMB \ MESSAGING \ ICONV \ - registry \ - LIBCRYPTO \ POPT_CREDENTIALS \ TORTURE_AUTH \ TORTURE_UTIL \ @@ -55,4 +44,3 @@ PRIVATE_DEPENDENCIES = \ share # End SUBSYSTEM TORTURE_LOCAL ################################# - diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index a52f5d2f7d..bee9550bc5 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -40,7 +40,6 @@ torture_local_socket, torture_local_socket_wrapper, torture_pac, - torture_registry, torture_local_resolve, torture_local_sddl, torture_local_ndr, |