summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/script/tests/test_local.sh2
-rw-r--r--source4/torture/config.mk3
-rw-r--r--source4/torture/local/config.mk3
-rw-r--r--source4/torture/local/ndr.c (renamed from source4/torture/rpc/ndr.c)4
-rw-r--r--source4/torture/torture.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index eda7b44ca5..3d577152bc 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-local_tests="LOCAL-NTLMSSP LOCAL-TALLOC LOCAL-MESSAGING LOCAL-IRPC LOCAL-BINDING LOCAL-IDTREE LOCAL-SOCKET LOCAL-PAC LOCAL-STRLIST LOCAL-SDDL"
+local_tests="LOCAL-NTLMSSP LOCAL-TALLOC LOCAL-MESSAGING LOCAL-IRPC LOCAL-BINDING LOCAL-IDTREE LOCAL-SOCKET LOCAL-PAC LOCAL-STRLIST LOCAL-SDDL LOCAL-NDR"
if [ $# -lt 0 ]; then
cat <<EOF
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 2d934fa009..ec79675f65 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -108,8 +108,7 @@ OBJ_FILES = \
rpc/bind.o \
rpc/dssetup.o \
rpc/alter_context.o \
- rpc/bench.o \
- rpc/ndr.o
+ rpc/bench.o
REQUIRED_SUBSYSTEMS = \
NDR_ALL RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 1d1112b85a..f45fb2247d 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -13,7 +13,8 @@ OBJ_FILES = \
resolve.o \
util_strlist.o \
util_file.o \
- sddl.o
+ sddl.o \
+ ndr.o
REQUIRED_SUBSYSTEMS = \
LIBSMB \
MESSAGING \
diff --git a/source4/torture/rpc/ndr.c b/source4/torture/local/ndr.c
index 6dbcf3e795..5daea96655 100644
--- a/source4/torture/rpc/ndr.c
+++ b/source4/torture/local/ndr.c
@@ -81,13 +81,13 @@ BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
return True;
}
-BOOL torture_rpc_ndr(void)
+BOOL torture_local_ndr(void)
{
NTSTATUS status;
TALLOC_CTX *mem_ctx;
BOOL ret = True;
- mem_ctx = talloc_init("torture_rpc_mgmt");
+ mem_ctx = talloc_init("torture_local_ndr");
ret &= test_check_string_terminator(mem_ctx);
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 1b591c6bb8..f53fca38df 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2305,7 +2305,6 @@ static struct {
{"RPC-ALTERCONTEXT", torture_rpc_alter_context, 0},
{"RPC-JOIN", torture_rpc_join, 0},
{"RPC-DSSYNC", torture_rpc_dssync, 0},
- {"RPC-NDR", torture_rpc_ndr, 0},
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},
@@ -2322,6 +2321,7 @@ static struct {
{"LOCAL-REGISTRY", torture_registry, 0},
{"LOCAL-RESOLVE", torture_local_resolve, 0},
{"LOCAL-SDDL", torture_local_sddl, 0},
+ {"LOCAL-NDR", torture_local_ndr, 0},
/* COM (Component Object Model) testers */
{"COM-SIMPLE", torture_com_simple, 0 },