summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-08-05 04:55:04 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-08-11 00:18:14 +0300
commitc30f9bd7345cddd85502eb9d099279606959f447 (patch)
tree5a78d24886cc0d9aa63665dbb2bc1b8e1686c90d /source4/torture
parentda074f10e3900413a134ee8143c68f05563da13f (diff)
downloadsamba-c30f9bd7345cddd85502eb9d099279606959f447.tar.gz
samba-c30f9bd7345cddd85502eb9d099279606959f447.tar.bz2
samba-c30f9bd7345cddd85502eb9d099279606959f447.zip
s4-test: Move RPC-DSSYNC test in DRS-RPC test suite
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/drs/drs_init.c2
-rw-r--r--source4/torture/drs/wscript_build2
-rw-r--r--source4/torture/rpc/rpc.c1
-rw-r--r--source4/torture/wscript_build2
4 files changed, 4 insertions, 3 deletions
diff --git a/source4/torture/drs/drs_init.c b/source4/torture/drs/drs_init.c
index 35520ba54a..aba35341b6 100644
--- a/source4/torture/drs/drs_init.c
+++ b/source4/torture/drs/drs_init.c
@@ -34,6 +34,8 @@ static struct torture_suite * torture_drs_rpc_suite(TALLOC_CTX *mem_ctx)
talloc_autofree_context(),
"RPC");
+ torture_drs_rpc_dssync_tcase(suite);
+
return suite;
}
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index cd7e3af925..38816a6a2e 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
bld.SAMBA_MODULE('TORTURE_DRS',
- source='drs_init.c drs_util.c unit/prefixmap_tests.c unit/schemainfo_tests.c',
+ source='drs_init.c drs_util.c unit/prefixmap_tests.c unit/schemainfo_tests.c rpc/dssync.c',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index b386c6a106..c652ec607c 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -484,7 +484,6 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_suite(suite, torture_rpc_browser(suite));
torture_suite_add_simple_test(suite, "ALTERCONTEXT", torture_rpc_alter_context);
torture_suite_add_simple_test(suite, "JOIN", torture_rpc_join);
- torture_drs_rpc_dssync_tcase(suite);
torture_drs_rpc_dsgetinfo_tcase(suite);
torture_suite_add_simple_test(suite, "BENCH-RPC", torture_bench_rpc);
torture_suite_add_simple_test(suite, "ASYNCBIND", torture_async_bind);
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index b5e80bf322..d8ad6df1c9 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -40,7 +40,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
bld.SAMBA_MODULE('torture_rpc',
- source='rpc/join.c rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/multi_bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c',
+ source='rpc/join.c rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c rpc/dfs.c rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dsgetinfo.c rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/spoolss_access.c rpc/unixinfo.c rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/multi_bind.c rpc/dssetup.c rpc/alter_context.c rpc/bench.c rpc/samba3rpc.c rpc/rpc.c rpc/async_bind.c rpc/handles.c rpc/frsapi.c rpc/object_uuid.c rpc/ntsvcs.c rpc/browser.c rpc/bind.c',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',