diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-29 20:35:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:48:59 -0500 |
| commit | 19d606ce180d197dd8e7dec2f92427cd7722b0e3 (patch) | |
| tree | 33b898aee505c5c8568167da7a1812e43768146b /source4/torture | |
| parent | 70a15ba4df525838474dce086989582adf6e4de8 (diff) | |
| download | samba-19d606ce180d197dd8e7dec2f92427cd7722b0e3.tar.gz | |
r12584: Move NDR tests from rpc/ to local/, add to list of tests
to run for 'make all'
(This used to be commit e71cd4778b9a872642619452e574f510e2491052)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/config.mk | 3 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 3 | ||||
| -rw-r--r-- | source4/torture/local/ndr.c (renamed from source4/torture/rpc/ndr.c) | 4 | ||||
| -rw-r--r-- | source4/torture/torture.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 2d934fa009d..ec79675f650 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 1d1112b85a8..f45fb2247d8 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 6dbcf3e7950..5daea966559 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 1b591c6bb84..f53fca38dfe 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 }, |