s3-torture: give torture test binaries their own wscript_build

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/torture/wscript_build b/source3/torture/wscript_build
new file mode 100644 (file)
index 0000000..bde70d6
--- /dev/null
+++ b/source3/torture/wscript_build
@@ -0,0 +1,136 @@
+#!/usr/bin/env python
+
+bld.SAMBA3_BINARY('locktest2',
+                 source='locktest2.c',
+                 deps='''
+                      talloc
+                      smbconf
+                      libsmb
+                      LOCKING
+                      ''',
+                 for_selftest=True)
+
+TORTURE3_ADDITIONAL_SOURCE=""
+
+if bld.env.with_ctdb:
+    TORTURE3_ADDITIONAL_SOURCE += ' test_ctdbd_conn.c'
+
+bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
+                 source='''
+                        torture.c
+                        nbio.c
+                        scanner.c
+                        utable.c
+                        denytest.c
+                        mangle_test.c
+                        nbench.c
+                        test_async_echo.c
+                        test_addrchange.c
+                        test_matching.c
+                        test_posix_append.c
+                        test_posix.c
+                        test_nttrans_create.c
+                        test_nttrans_fsctl.c
+                        test_case_insensitive.c
+                        test_notify_online.c
+                        test_chain3.c
+                        test_smb2.c
+                        test_authinfo_structs.c
+                        test_smbsock_any_connect.c
+                        test_cleanup.c
+                        test_notify.c
+                        ../lib/tevent_barrier.c
+                        test_dbwrap_watch.c
+                        test_dbwrap_do_locked.c
+                        test_idmap_tdb_common.c
+                        test_dbwrap_ctdb.c
+                        test_buffersize.c
+                        test_messaging_read.c
+                        test_messaging_fd_passing.c
+                        test_messaging_send_all.c
+                        test_oplock_cancel.c
+                        test_pthreadpool_tevent.c
+                        bench_pthreadpool.c
+                        wbc_async.c
+                        test_g_lock.c
+                        test_namemap_cache.c
+                        test_idmap_cache.c
+                        test_hidenewfiles.c
+                        test_readdir_timestamp.c
+                        ../lib/util_sd.c
+                        ''' + TORTURE3_ADDITIONAL_SOURCE,
+                 deps='''
+                      talloc
+                      smbconf
+                      libsmb
+                      msrpc3
+                      TLDAP
+                      RPC_NDR_ECHO
+                      WB_REQTRANS
+                      LOCKING
+                      NDR_OPEN_FILES
+                      idmap
+                      IDMAP_TDB_COMMON
+                      libcli_lsa3
+                      samba-cluster-support
+                      ''',
+                 cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+                 for_selftest=True)
+
+bld.SAMBA3_BINARY('msgtest',
+                 source='msgtest.c',
+                 deps='''
+                      talloc
+                      smbconf
+                      ''',
+                 install=False)
+
+bld.SAMBA3_BINARY('msg_sink',
+                 source='msg_sink.c',
+                 deps='''
+                      talloc
+                      smbconf
+                      ''',
+                 install=False)
+
+bld.SAMBA3_BINARY('msg_source',
+                 source='msg_source.c',
+                 deps='''
+                      talloc
+                      smbconf
+                      ''',
+                 install=False)
+
+bld.SAMBA3_BINARY('pdbtest',
+                 source='pdbtest.c',
+                 deps='''
+                      talloc
+                      pdb
+                      CMDLINE_S3
+                      AUTH_COMMON
+                      auth
+                      ''',
+                 for_selftest=True)
+
+bld.SAMBA3_BINARY('vfstest',
+                 source='''
+                        cmd_vfs.c
+                        vfstest.c
+                        vfstest_chain.c
+                        ''',
+                 deps='''
+                      vfs
+                      CMDLINE_S3
+                      smbconf
+                      SMBREADLINE
+                      ''',
+                 for_selftest=True)
+
+bld.SAMBA3_BINARY('rpc_open_tcp',
+                 source='rpc_open_tcp.c',
+                 deps='''
+                      talloc
+                      msrpc3
+                      ''',
+                 for_selftest=True)
+

diff --git a/source3/wscript_build b/source3/wscript_build
index 55851c7b3a6c283bde77e0a49db146af2447c380..8f5ce0e99ffeaa279a5d7b5a1f88fd761ce14b5b 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1153,83 +1153,6 @@ bld.SAMBA3_BINARY('smbspool_argv_wrapper',
                  source='script/tests/smbspool_argv_wrapper.c',
                  for_selftest=True)
 
-bld.SAMBA3_BINARY('locktest2',
-                 source='torture/locktest2.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      libsmb
-                      LOCKING
-                      ''',
-                 for_selftest=True)
-
-TORTURE3_ADDITIONAL_SOURCE=""
-
-if bld.env.with_ctdb:
-    TORTURE3_ADDITIONAL_SOURCE += ' torture/test_ctdbd_conn.c'
-
-bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
-                 source='''
-                        torture/torture.c
-                        torture/nbio.c
-                        torture/scanner.c
-                        torture/utable.c
-                        torture/denytest.c
-                        torture/mangle_test.c
-                        torture/nbench.c
-                        torture/test_async_echo.c
-                        torture/test_addrchange.c
-                        torture/test_matching.c
-                        torture/test_posix_append.c
-                        torture/test_posix.c
-                        torture/test_nttrans_create.c
-                        torture/test_nttrans_fsctl.c
-                        torture/test_case_insensitive.c
-                        torture/test_notify_online.c
-                        torture/test_chain3.c
-                        torture/test_smb2.c
-                        torture/test_authinfo_structs.c
-                        torture/test_smbsock_any_connect.c
-                        torture/test_cleanup.c
-                        torture/test_notify.c
-                        lib/tevent_barrier.c
-                        torture/test_dbwrap_watch.c
-                        torture/test_dbwrap_do_locked.c
-                        torture/test_idmap_tdb_common.c
-                        torture/test_dbwrap_ctdb.c
-                        torture/test_buffersize.c
-                        torture/test_messaging_read.c
-                        torture/test_messaging_fd_passing.c
-                        torture/test_messaging_send_all.c
-                        torture/test_oplock_cancel.c
-                        torture/test_pthreadpool_tevent.c
-                        torture/bench_pthreadpool.c
-                        torture/wbc_async.c
-                        torture/test_g_lock.c
-                        torture/test_namemap_cache.c
-                        torture/test_idmap_cache.c
-                        torture/test_hidenewfiles.c
-                        torture/test_readdir_timestamp.c
-                        lib/util_sd.c
-                        ''' + TORTURE3_ADDITIONAL_SOURCE,
-                 deps='''
-                      talloc
-                      smbconf
-                      libsmb
-                      msrpc3
-                      TLDAP
-                      RPC_NDR_ECHO
-                      WB_REQTRANS
-                      LOCKING
-                      NDR_OPEN_FILES
-                      idmap
-                      IDMAP_TDB_COMMON
-                      libcli_lsa3
-                      samba-cluster-support
-                      ''',
-                 cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
-                 for_selftest=True)
-
 bld.SAMBA3_BINARY('smbconftort',
                  source='lib/smbconf/testsuite.c',
                  deps='''
@@ -1239,30 +1162,6 @@ bld.SAMBA3_BINARY('smbconftort',
                       ''',
                  for_selftest=True)
 
-bld.SAMBA3_BINARY('msgtest',
-                 source='torture/msgtest.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('msg_sink',
-                 source='torture/msg_sink.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      ''',
-                 install=False)
-
-bld.SAMBA3_BINARY('msg_source',
-                 source='torture/msg_source.c',
-                 deps='''
-                      talloc
-                      smbconf
-                      ''',
-                 install=False)
-
 bld.SAMBA3_BINARY('test_mdsparser_es',
                  source='''
                  rpc_server/mdssvc/test_mdsparser_es.c
@@ -1281,31 +1180,6 @@ bld.SAMBA3_BINARY('test_mdsparser_es',
                  enabled=bld.env.spotlight_backend_es,
                  for_selftest=True)
 
-bld.SAMBA3_BINARY('pdbtest',
-                 source='torture/pdbtest.c',
-                 deps='''
-                      talloc
-                      pdb
-                      CMDLINE_S3
-                      AUTH_COMMON
-                      auth
-                      ''',
-                 for_selftest=True)
-
-bld.SAMBA3_BINARY('vfstest',
-                 source='''
-                        torture/cmd_vfs.c
-                        torture/vfstest.c
-                        torture/vfstest_chain.c
-                        ''',
-                 deps='''
-                      vfs
-                      CMDLINE_S3
-                      smbconf
-                      SMBREADLINE
-                      ''',
-                 for_selftest=True)
-
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',
                  deps='''
@@ -1318,14 +1192,6 @@ bld.SAMBA3_BINARY('timelimit',
                  source='script/tests/timelimit.c',
                  for_selftest=True)
 
-bld.SAMBA3_BINARY('rpc_open_tcp',
-                 source='torture/rpc_open_tcp.c',
-                 deps='''
-                      talloc
-                      msrpc3
-                      ''',
-                 for_selftest=True)
-
 bld.SAMBA3_BINARY('vlp',
                  source='printing/tests/vlp.c',
                  deps='''
@@ -1419,6 +1285,7 @@ bld.RECURSE('rpcclient')
 bld.RECURSE('utils')
 bld.RECURSE('nmbd')
 bld.RECURSE('lib/util')
+bld.RECURSE('torture')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()