build: waf quicktest nearly works

Rewrote wafsamba using a new dependency handling system, and started
adding the waf test code

7 files changed, 28 insertions, 28 deletions

diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 2743b7c2ad..4008ac9a41 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -8,6 +8,6 @@ bld.SAMBA_MODULE('TORTURE_DRS',
 	subsystem='smbtorture',
 	init_function='torture_drs_init',
 	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
diff --git a/source4/torture/libnetapi/wscript_build b/source4/torture/libnetapi/wscript_build
index 5110cf54ce..bea5f06f9e 100644
--- a/source4/torture/libnetapi/wscript_build
+++ b/source4/torture/libnetapi/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_MODULE('TORTURE_LIBNETAPI',
 	subsystem='smbtorture',
 	init_function='torture_libnetapi_init',
 	deps='POPT_CREDENTIALS NETAPI',
-	output_type='MERGED_OBJ',
+	internal_module=True,
         enabled=False
 	)
 
diff --git a/source4/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build
index 688e0a9533..6fd5e8d7a3 100644
--- a/source4/torture/libsmbclient/wscript_build
+++ b/source4/torture/libsmbclient/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_MODULE('TORTURE_LIBSMBCLIENT',
 	subsystem='smbtorture',
 	init_function='torture_libsmbclient_init',
 	deps='POPT_CREDENTIALS SMBCLIENT',
-	output_type='MERGED_OBJ',
+	internal_module=True,
         enabled=False
 	)
 
diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index f930a432cb..785101ed79 100644
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -3,6 +3,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL',
 	autoproto='proto.h',
 	subsystem='smbtorture',
 	init_function='torture_local_init',
-	deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB',
-	output_type='MERGED_OBJ'
+	deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING ICONV POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB SOCKET_WRAPPER',
+	internal_module=True
 	)
diff --git a/source4/torture/smb2/wscript_build b/source4/torture/smb2/wscript_build
index 542ebf4f4a..7d4f48813c 100644
--- a/source4/torture/smb2/wscript_build
+++ b/source4/torture/smb2/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('TORTURE_SMB2',
 	source='connect.c scan.c util.c getinfo.c setinfo.c lock.c notify.c smb2.c durable_open.c oplock.c dir.c lease.c create.c acls.c read.c compound.c streams.c',
 	subsystem='smbtorture',
 	deps='LIBCLI_SMB2 POPT_CREDENTIALS torture',
-	output_type='MERGED_OBJ',
+	internal_module=True,
 	autoproto='proto.h',
 	init_function='torture_smb2_init'
 	)
diff --git a/source4/torture/winbind/wscript_build b/source4/torture/winbind/wscript_build
index 82bf44fb2a..4345b7bd0b 100644
--- a/source4/torture/winbind/wscript_build
+++ b/source4/torture/winbind/wscript_build
@@ -4,5 +4,5 @@ bld.SAMBA_MODULE('TORTURE_WINBIND',
 	subsystem='smbtorture',
 	init_function='torture_winbind_init',
 	deps='LIBWBCLIENT LIBWBCLIENT_ASYNC LIBWINBIND-CLIENT torture PAM_ERRORS',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 5be7385e5d..489d3300ae 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -10,22 +10,22 @@ bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
 
 
 bld.SAMBA_MODULE('TORTURE_BASIC',
-	source='basic/base.c basic/misc.c basic/scanner.c ./rpc/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c raw/rename.c ./basic/rename.c basic/dir.c ./smb2/dir.c basic/delete.c raw/unlink.c ./basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
+	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_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW',
-	output_type='MERGED_OBJ',
+	internal_module=True,
 	autoproto='basic/proto.h',
 	init_function='torture_base_init'
 	)
 
 
 bld.SAMBA_MODULE('TORTURE_RAW',
-	source='raw/qfsinfo.c raw/qfileinfo.c raw/setfileinfo.c raw/search.c raw/close.c raw/open.c raw/mkdir.c raw/oplock.c ./smb2/oplock.c raw/notify.c ./smb2/notify.c raw/mux.c raw/ioctl.c raw/chkpath.c raw/unlink.c ./basic/unlink.c raw/read.c ./smb2/read.c raw/context.c raw/write.c raw/lock.c ./smb2/lock.c raw/pingpong.c raw/lockbench.c raw/lookuprate.c raw/tconrate.c raw/openbench.c raw/rename.c ./basic/rename.c raw/eas.c raw/streams.c ./smb2/streams.c raw/acls.c ./smb2/acls.c raw/seek.c raw/samba3hide.c raw/samba3misc.c raw/composite.c raw/raw.c raw/offline.c',
+	source='raw/qfsinfo.c raw/qfileinfo.c raw/setfileinfo.c raw/search.c raw/close.c raw/open.c raw/mkdir.c raw/oplock.c raw/notify.c raw/mux.c raw/ioctl.c raw/chkpath.c raw/unlink.c raw/read.c raw/context.c raw/write.c raw/lock.c raw/pingpong.c raw/lockbench.c raw/lookuprate.c raw/tconrate.c raw/openbench.c raw/rename.c raw/eas.c raw/streams.c raw/acls.c raw/seek.c raw/samba3hide.c raw/samba3misc.c raw/composite.c raw/raw.c raw/offline.c',
 	autoproto='raw/proto.h',
 	subsystem='smbtorture',
 	init_function='torture_raw_init',
 	deps='LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE POPT_CREDENTIALS TORTURE_UTIL',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 bld.BUILD_SUBDIR('smb2')
@@ -34,19 +34,19 @@ bld.BUILD_SUBDIR('libnetapi')
 bld.BUILD_SUBDIR('libsmbclient')
 
 bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
-	source='ndr/ndr.c ndr/winreg.c ./rpc/winreg.c ndr/atsvc.c ./rpc/atsvc.c ndr/lsa.c ./rpc/lsa.c ndr/epmap.c ndr/dfs.c ./rpc/dfs.c ndr/netlogon.c ./rpc/netlogon.c ndr/drsuapi.c ./rpc/drsuapi.c ndr/spoolss.c ./rpc/spoolss.c ndr/samr.c ./rpc/samr.c ndr/dfsblob.c',
+	source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/samr.c ndr/dfsblob.c',
 	autoproto='ndr/proto.h',
 	deps='torture SERVICE_SMB'
 	)
 
 
 bld.SAMBA_MODULE('torture_rpc',
-	source='rpc/join.c ndr/lsa.c ./rpc/lsa.c rpc/lsa_lookup.c rpc/session_key.c rpc/echo.c ndr/dfs.c ./rpc/dfs.c ndr/drsuapi.c ./rpc/drsuapi.c rpc/drsuapi_cracknames.c rpc/dssync.c rpc/dsgetinfo.c ndr/spoolss.c ./rpc/spoolss.c rpc/spoolss_notify.c rpc/spoolss_win.c rpc/unixinfo.c ndr/samr.c ./rpc/samr.c rpc/samr_accessmask.c rpc/wkssvc.c rpc/srvsvc.c rpc/svcctl.c ndr/atsvc.c ./rpc/atsvc.c rpc/eventlog.c rpc/epmapper.c ndr/winreg.c ./rpc/winreg.c rpc/initshutdown.c rpc/oxidresolve.c rpc/remact.c rpc/mgmt.c basic/scanner.c ./rpc/scanner.c rpc/autoidl.c rpc/countcalls.c rpc/testjoin.c rpc/schannel.c ndr/netlogon.c ./rpc/netlogon.c rpc/remote_pac.c rpc/samlogon.c rpc/samsync.c rpc/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',
+	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/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/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',
 	autoproto='rpc/proto.h',
 	subsystem='smbtorture',
 	init_function='torture_rpc_init',
 	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 bld.BUILD_SUBDIR('drs')
@@ -57,7 +57,7 @@ bld.SAMBA_MODULE('TORTURE_RAP',
 	subsystem='smbtorture',
 	init_function='torture_rap_init',
 	deps='TORTURE_UTIL LIBCLI_SMB',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 
@@ -66,7 +66,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH',
 	autoproto='auth/proto.h',
 	subsystem='smbtorture',
 	deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 bld.BUILD_SUBDIR('local')
@@ -77,7 +77,7 @@ bld.SAMBA_MODULE('TORTURE_NBENCH',
 	subsystem='smbtorture',
 	init_function='torture_nbench_init',
 	deps='TORTURE_UTIL',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 
@@ -87,7 +87,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX',
 	subsystem='smbtorture',
 	init_function='torture_unix_init',
 	deps='TORTURE_UTIL',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 
@@ -95,7 +95,7 @@ bld.SAMBA_MODULE('TORTURE_LDAP',
 	source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
 	subsystem='smbtorture',
 	deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDB_WRAP',
-	output_type='MERGED_OBJ',
+	internal_module=True,
 	autoproto='ldap/proto.h',
 	init_function='torture_ldap_init'
 	)
@@ -107,7 +107,7 @@ bld.SAMBA_MODULE('TORTURE_NBT',
 	subsystem='smbtorture',
 	init_function='torture_nbt_init',
 	deps='LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 
@@ -117,7 +117,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
 	subsystem='smbtorture',
 	init_function='torture_net_init',
 	deps='LIBSAMBA-NET POPT_CREDENTIALS torture_rpc PROVISION',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
 
@@ -127,18 +127,18 @@ bld.SAMBA_MODULE('TORTURE_NTP',
 	subsystem='smbtorture',
 	init_function='torture_ntp_init',
 	deps='POPT_CREDENTIALS torture_rpc',
-	output_type='MERGED_OBJ'
+	internal_module=True
 	)
 
-TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP'
+TORTURE_MODULES = 'TORTURE_BASIC TORTURE_RAW torture_rpc TORTURE_RAP TORTURE_AUTH TORTURE_NBENCH TORTURE_UNIX TORTURE_LDAP TORTURE_NBT TORTURE_NET TORTURE_NTP torture_registry'
 
 bld.SAMBA_BINARY('smbtorture',
 	source='smbtorture.c torture.c',
 	manpages='man/smbtorture.1',
 	public_headers='smbtorture.h',
 	installdir='BINDIR',
-        subsystem='smbtorture',
-	deps='torture LIBPOPT POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES
+	deps='torture LIBPOPT POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
+        needs_python=True
 	)
 
 
@@ -161,11 +161,11 @@ bld.SAMBA_BINARY('masktest',
 bld.SAMBA_BINARY('locktest',
 	source='locktest.c',
 	# COV_TARGET='test',
-	ldflags='--coverage',
-	manpages='man/locktest.1',
+	#ldflags='--coverage',
+	#cflags='--coverage',
 	# GCOV='1',
+	manpages='man/locktest.1',
 	deps='LIBPOPT POPT_SAMBA POPT_CREDENTIALS LIBSAMBA-UTIL LIBCLI_SMB LIBSAMBA-HOSTCONFIG',
-	cflags='--coverage',
 	installdir='BINDIR'
 	)