s4:torture: Migrate smbtorture to new cmdline option parser

[samba.git] / source4 / torture / wscript_build

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 1b781266e430e45ec82fe7bcecc08c0f3f52e410..4b3309a9ab4997c768f3866c71debfa9c76a232f 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -5,7 +5,7 @@ samba_net = bld.pyembed_libname('samba-net')
 
 bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
        source='util_smb.c',
-       public_deps='torture popt POPT_CREDENTIALS',
+       public_deps='torture',
        deps='smbclient-raw'
        )
 
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
 bld.SAMBA_MODULE('TORTURE_BASIC',
        source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB popt POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
+       deps='LIBCLI_SMB TORTURE_UTIL smbclient-raw TORTURE_RAW',
        internal_module=True,
        autoproto='basic/proto.h',
        init_function='torture_base_init',
@@ -26,7 +26,7 @@ bld.SAMBA_MODULE('TORTURE_RAW',
        autoproto='raw/proto.h',
        subsystem='smbtorture',
        init_function='torture_raw_init',
-       deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE popt POPT_CREDENTIALS TORTURE_UTIL',
+       deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE TORTURE_UTIL',
        internal_module=True,
        enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
@@ -172,7 +172,7 @@ bld.SAMBA_MODULE('torture_rpc',
                       %s
                       LIBCLI_AUTH
                       popt
-                      POPT_CREDENTIALS
+                      CMDLINE_S4
                       TORTURE_LDAP
                       TORTURE_UTIL
                       TORTURE_RAP
@@ -221,7 +221,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH',
        source='auth/ntlmssp.c auth/pac.c auth/smbencrypt.c',
        autoproto='auth/proto.h',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB gensec auth4 authkrb5 popt POPT_CREDENTIALS smbpasswdparser torture com_err gensec_ntlmssp',
+       deps='LIBCLI_SMB gensec auth4 authkrb5 smbpasswdparser torture com_err gensec_ntlmssp',
        internal_module=True
        )
 
@@ -262,7 +262,7 @@ bld.SAMBA_MODULE('TORTURE_LDAP',
             ldap/session_expiry.c
             ''',
        subsystem='smbtorture',
-       deps='cli-ldap cli_cldap samdb popt POPT_CREDENTIALS torture ldbsamba',
+       deps='cli-ldap cli_cldap samdb torture ldbsamba',
        internal_module=True,
        autoproto='ldap/proto.h',
        init_function='torture_ldap_init'
@@ -285,7 +285,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
        autoproto='libnet/proto.h',
        subsystem='smbtorture',
        init_function='torture_net_init',
-       deps='%s popt POPT_CREDENTIALS torture_rpc %s' % (provision, samba_net),
+       deps='%s torture_rpc %s' % (provision, samba_net),
        internal_module=True,
        enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
@@ -296,7 +296,7 @@ bld.SAMBA_MODULE('TORTURE_NTP',
        autoproto='ntp/proto.h',
        subsystem='smbtorture',
        init_function='torture_ntp_init',
-       deps='popt POPT_CREDENTIALS torture_rpc',
+       deps='torture_rpc',
        internal_module=True,
        enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
@@ -304,7 +304,7 @@ bld.SAMBA_MODULE('TORTURE_NTP',
 bld.SAMBA_MODULE('TORTURE_VFS',
        source='vfs/vfs.c vfs/fruit.c vfs/acl_xattr.c',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
+       deps='LIBCLI_SMB TORTURE_UTIL smbclient-raw TORTURE_RAW',
        internal_module=True,
        autoproto='vfs/proto.h',
        init_function='torture_vfs_init'
@@ -315,7 +315,7 @@ TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUT
 bld.SAMBA_SUBSYSTEM('torturemain',
                     source='smbtorture.c torture.c shell.c',
                     subsystem_name='smbtorture',
-                    deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+                    deps='torture dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
                     enabled=bld.PYTHON_BUILD_IS_ENABLED()
                     )
 
@@ -323,7 +323,7 @@ bld.SAMBA_BINARY('smbtorture',
                  source=[],
                  manpages='man/smbtorture.1',
                  private_headers='smbtorture.h',
-                 deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+                 deps='torturemain torture popt CMDLINE_S4 dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
                  pyembed=True,
                  enabled=bld.PYTHON_BUILD_IS_ENABLED()
                  )