diff options
| -rw-r--r-- | source4/torture/config.mk | 17 | ||||
| -rw-r--r-- | source4/torture/ldb/ldb.c | 15 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 4 | ||||
| -rw-r--r-- | source4/torture/local/local.c | 1 | ||||
| -rw-r--r-- | source4/torture/torture.c | 1 |
5 files changed, 13 insertions, 25 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 3016478cda..72747a7886 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -110,7 +110,7 @@ PRIVATE_DEPENDENCIES = \ RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \ RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \ RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \ - LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_LDB TORTURE_UTIL TORTURE_RAP \ + LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP \ dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI torture_rpc_OBJ_FILES = $(addprefix $(torturesrcdir)/rpc/, \ @@ -199,21 +199,6 @@ TORTURE_LDAP_OBJ_FILES = $(addprefix $(torturesrcdir)/ldap/, common.o basic.o sc $(eval $(call proto_header_template,$(torturesrcdir)/ldap/proto.h,$(TORTURE_LDAP_OBJ_FILES:.o=.c))) ################################# -# Start SUBSYSTEM TORTURE_LDB -[MODULE::TORTURE_LDB] -SUBSYSTEM = smbtorture -OUTPUT_TYPE = MERGED_OBJ -INIT_FUNCTION = torture_ldb_init -PRIVATE_DEPENDENCIES = \ - LDB_WRAP -# End SUBSYSTEM TORTURE_LDB -################################# - -TORTURE_LDB_OBJ_FILES = $(addprefix $(torturesrcdir)/ldb/, ldb.o) - -$(eval $(call proto_header_template,$(torturesrcdir)/ldb/proto.h,$(TORTURE_LDB_OBJ_FILES:.o=.c))) - -################################# # Start SUBSYSTEM TORTURE_NBT [MODULE::TORTURE_NBT] SUBSYSTEM = smbtorture diff --git a/source4/torture/ldb/ldb.c b/source4/torture/ldb/ldb.c index 193ccc1b17..d9036dd672 100644 --- a/source4/torture/ldb/ldb.c +++ b/source4/torture/ldb/ldb.c @@ -28,7 +28,7 @@ #include "dsdb/samdb/samdb.h" #include "param/param.h" #include "torture/smbtorture.h" -#include "torture/ldb/proto.h" +#include "torture/local/proto.h" static const char *sid = "S-1-5-21-4177067393-1453636373-93818737"; static const char *hex_sid = "01040000000000051500000081FDF8F815BBA456718F9705"; @@ -752,9 +752,14 @@ static bool torture_ldb_dn_invalid_extended(struct torture_context *torture) return true; } -NTSTATUS torture_ldb_init(void) +struct torture_suite *torture_ldb(TALLOC_CTX *mem_ctx) { - struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "LDB"); + struct torture_suite *suite = torture_suite_create(mem_ctx, "LDB"); + + if (suite == NULL) { + return NULL; + } + torture_suite_add_simple_test(suite, "ATTRS", torture_ldb_attrs); torture_suite_add_simple_test(suite, "DN-ATTRS", torture_ldb_dn_attrs); torture_suite_add_simple_test(suite, "DN-EXTENDED", torture_ldb_dn_extended); @@ -763,7 +768,5 @@ NTSTATUS torture_ldb_init(void) suite->description = talloc_strdup(suite, "LDB (samba-specific behaviour) tests"); - torture_register_suite(suite); - - return NT_STATUS_OK; + return suite; } diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 967e545225..5c8c1d5762 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -51,7 +51,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../auth/credentials/tests/simple.o \ $(torturesrcdir)/local/local.o \ $(torturesrcdir)/local/dbspeed.o \ - $(torturesrcdir)/local/torture.o - + $(torturesrcdir)/local/torture.o \ + $(torturesrcdir)/ldb/ldb.o $(eval $(call proto_header_template,$(torturesrcdir)/local/proto.h,$(TORTURE_LOCAL_OBJ_FILES:.o=.c))) diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 6b38cd6db0..a1b100edb8 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -56,6 +56,7 @@ torture_local_torture, torture_local_dbspeed, torture_local_credentials, + torture_ldb, torture_registry, NULL }; diff --git a/source4/torture/torture.c b/source4/torture/torture.c index deae65c265..a9ec325dd6 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -50,7 +50,6 @@ _PUBLIC_ int torture_init(void) { extern NTSTATUS torture_base_init(void); extern NTSTATUS torture_ldap_init(void); - extern NTSTATUS torture_ldb_init(void); extern NTSTATUS torture_local_init(void); extern NTSTATUS torture_nbt_init(void); extern NTSTATUS torture_nbench_init(void); |