sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

r25928: Split up torture-local a bit.

Browse Source 
(This used to be commit c6b109040856ba0f1ae0db2787cc838ff61df767)
This commit is contained in:
Jelmer Vernooij 2007-11-11 23:36:53 +01:00 committed by Stefan Metzmacher
parent 6ee570c327
commit dbc78e2016
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/lib/basic.mk
View File

@ -31,6 +31,16 @@ OBJ_FILES = \
# End SUBSYSTEM LIBCRYPTO # 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 # Start SUBSYSTEM LIBCOMPRESSION
[SUBSYSTEM::LIBCOMPRESSION] [SUBSYSTEM::LIBCOMPRESSION]

10
source4/lib/registry/config.mk
View File

@ -91,3 +91,13 @@ PRIVATE_DEPENDENCIES = \
MANPAGE = man/regtree.1 MANPAGE = man/regtree.1
# End BINARY regtree # 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

16
source4/lib/registry/tests/generic.c
View File

@ -112,11 +112,9 @@ static bool test_reg_val_description_nullname(struct torture_context *ctx)
return true; return true;
} }
_PUBLIC_ NTSTATUS torture_registry_init(void)
struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx)
{ {
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", torture_suite_add_simple_test(suite, "str_regtype",
test_str_regtype); test_str_regtype);
torture_suite_add_simple_test(suite, "reg_val_data_string dword", 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", torture_suite_add_simple_test(suite, "reg_val_description null",
test_reg_val_description_nullname); test_reg_val_description_nullname);
torture_suite_add_suite(suite, torture_registry_hive(mem_ctx)); torture_suite_add_suite(suite, torture_registry_hive(suite));
torture_suite_add_suite(suite, torture_registry_registry(mem_ctx)); torture_suite_add_suite(suite, torture_registry_registry(suite));
torture_suite_add_suite(suite, torture_registry_diff(mem_ctx)); torture_suite_add_suite(suite, torture_registry_diff(suite));
return suite; torture_register_suite(suite);
return NT_STATUS_OK;
} }

14
source4/torture/local/config.mk
View File

@ -7,11 +7,6 @@ PRIVATE_PROTO_HEADER = \
proto.h proto.h
OBJ_FILES = \ OBJ_FILES = \
../../lib/charset/tests/iconv.o \ ../../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/talloc/testsuite.o \
../../lib/replace/test/os2_delete.o \ ../../lib/replace/test/os2_delete.o \
../../lib/replace/test/strptime.o \ ../../lib/replace/test/strptime.o \
@ -22,17 +17,13 @@ OBJ_FILES = \
../../lib/util/tests/idtree.o \ ../../lib/util/tests/idtree.o \
../../lib/socket/testsuite.o \ ../../lib/socket/testsuite.o \
../../lib/socket_wrapper/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 \ ../../libcli/resolve/testsuite.o \
../../lib/util/tests/strlist.o \ ../../lib/util/tests/strlist.o \
../../lib/util/tests/str.o \ ../../lib/util/tests/str.o \
../../lib/util/tests/file.o \ ../../lib/util/tests/file.o \
../../lib/util/tests/genrand.o \ ../../lib/util/tests/genrand.o \
../../lib/compression/testsuite.o \ ../../lib/compression/testsuite.o \
../../lib/charset/testsuite.o \ ../../lib/charset/tests/charset.o \
../../libcli/security/tests/sddl.o \ ../../libcli/security/tests/sddl.o \
../../lib/tdr/testsuite.o \ ../../lib/tdr/testsuite.o \
../../lib/events/testsuite.o \ ../../lib/events/testsuite.o \
@ -46,8 +37,6 @@ PRIVATE_DEPENDENCIES = \
LIBCLI_SMB \ LIBCLI_SMB \
MESSAGING \ MESSAGING \
ICONV \ ICONV \
registry \
LIBCRYPTO \
POPT_CREDENTIALS \ POPT_CREDENTIALS \
TORTURE_AUTH \ TORTURE_AUTH \
TORTURE_UTIL \ TORTURE_UTIL \
@ -55,4 +44,3 @@ PRIVATE_DEPENDENCIES = \
share share
# End SUBSYSTEM TORTURE_LOCAL # End SUBSYSTEM TORTURE_LOCAL
################################# #################################

1
source4/torture/local/local.c
View File

@ -40,7 +40,6 @@
torture_local_socket, torture_local_socket,
torture_local_socket_wrapper, torture_local_socket_wrapper,
torture_pac, torture_pac,
torture_registry,
torture_local_resolve, torture_local_resolve,
torture_local_sddl, torture_local_sddl,
torture_local_ndr, torture_local_ndr,