waf: disable-python - don't build torture bits

samba-net being disabled causes a chain of dependency or proto.h-based
missing code issues that require a number of modules or subsystems
to be disabled in samba4/torture.

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index cfdd8a2337e26b82b70369f3434abdfdbcdaadfb..67bf034a8c11f2c9f1156aa44a1e1d99d8fc9c22 100644 (file)
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -6,6 +6,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
        subsystem='smbtorture',
        init_function='torture_drs_init',
        deps='samba-util ldb POPT_SAMBA samba-errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS asn1util samdb NDR_DRSBLOBS samba-credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 

diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index 3a12b6bcd2728d919f04bfb4c3103690610dbcab..087b842141deb8d54195c9585fe3b75b594a5ca8 100644 (file)
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -32,5 +32,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL',
        subsystem='smbtorture',
        init_function='torture_local_init',
        deps=TORTURE_LOCAL_DEPS,
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index c065eaaa5ec73999ebef3d9a3ec1c519783e5fb5..fe066299ad39557873c163ce8375c9f8bdaa35e1 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -14,7 +14,8 @@ bld.SAMBA_MODULE('TORTURE_BASIC',
        deps='LIBCLI_SMB popt POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
        internal_module=True,
        autoproto='basic/proto.h',
-       init_function='torture_base_init'
+       init_function='torture_base_init',
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 
@@ -24,7 +25,8 @@ bld.SAMBA_MODULE('TORTURE_RAW',
        subsystem='smbtorture',
        init_function='torture_raw_init',
        deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE popt POPT_CREDENTIALS TORTURE_UTIL',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 bld.RECURSE('smb2')
@@ -67,7 +69,8 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
                   ndr/charset.c
                  ''',
        autoproto='ndr/proto.h',
-       deps='torture krb5samba'
+       deps='torture krb5samba',
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 torture_rpc_backupkey = ''
@@ -181,7 +184,8 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_BACKUPKEY
                       RPC_NDR_WINSPOOL
                       ''' + ntvfs_specific['deps'],
-                 internal_module=True)
+                 internal_module=True,
+                 enabled=bld.PYTHON_BUILD_IS_ENABLED())
 
 bld.RECURSE('drs')
 bld.RECURSE('dns')
@@ -192,7 +196,8 @@ bld.SAMBA_MODULE('TORTURE_RAP',
        subsystem='smbtorture',
        init_function='torture_rap_init',
        deps='TORTURE_UTIL LIBCLI_SMB NDR_RAP LIBCLI_RAP',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 bld.SAMBA_MODULE('TORTURE_DFS',
@@ -252,7 +257,8 @@ bld.SAMBA_MODULE('TORTURE_NBT',
        subsystem='smbtorture',
        init_function='torture_nbt_init',
        deps='LIBCLI_SMB cli-nbt LIBCLI_DGRAM LIBCLI_WREPL torture_rpc',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 
@@ -262,7 +268,8 @@ bld.SAMBA_MODULE('TORTURE_NET',
        subsystem='smbtorture',
        init_function='torture_net_init',
        deps='samba-net popt POPT_CREDENTIALS torture_rpc PROVISION',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 
@@ -272,7 +279,8 @@ bld.SAMBA_MODULE('TORTURE_NTP',
        subsystem='smbtorture',
        init_function='torture_ntp_init',
        deps='popt POPT_CREDENTIALS torture_rpc',
-       internal_module=True
+       internal_module=True,
+       enabled=bld.PYTHON_BUILD_IS_ENABLED()
        )
 
 bld.SAMBA_MODULE('TORTURE_VFS',
@@ -290,6 +298,7 @@ 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,
+                    enabled=bld.PYTHON_BUILD_IS_ENABLED()
                     )
 
 bld.SAMBA_BINARY('smbtorture',
@@ -297,7 +306,8 @@ bld.SAMBA_BINARY('smbtorture',
                  manpages='man/smbtorture.1',
                  private_headers='smbtorture.h',
                  deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
-                 pyembed=True
+                 pyembed=True,
+                 enabled=bld.PYTHON_BUILD_IS_ENABLED()
                  )
 
 bld.SAMBA_BINARY('gentest',