summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/basic.mk10
-rw-r--r--source4/lib/registry/config.mk10
-rw-r--r--source4/lib/registry/tests/generic.c16
3 files changed, 28 insertions, 8 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;
}