r24872: Use torture API a bit more
[kai/samba.git] / source4 / torture / config.mk
index 862051a1740a643cc696bda672bed2ec2d429649..fc85cc160aed50726d81a4fbcaefb7c23bd1a7db 100644 (file)
@@ -3,26 +3,21 @@
 DESCRIPTION = Samba torture (test) suite
 SO_VERSION = 0
 VERSION = 0.0.1
-PUBLIC_HEADERS = torture.h
+PUBLIC_HEADERS = torture.h ui.h
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
-               torture.o
-REQUIRED_SUBSYSTEMS = \
-               TORTURE_UTIL \
-               TORTURE_RAW \
-               TORTURE_SMB2 \
-               TORTURE_RAP \
-               TORTURE_AUTH \
-               TORTURE_LOCAL \
-               TORTURE_NBENCH \
-               TORTURE_LDAP \
-               TORTURE_NBT \
+               torture.o \
+               ui.o
+PUBLIC_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
-               LIBSAMBA-UTIL
+               LIBSAMBA-UTIL \
+               LIBTALLOC 
 
 [SUBSYSTEM::TORTURE_UTIL]
-OBJ_FILES = torture_util.o
+OBJ_FILES = util.o util_smb.o
+PRIVATE_DEPENDENCIES = LIBCLI_RAW
 PUBLIC_PROTO_HEADER = util.h
+PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
 
 #################################
 # Start SUBSYSTEM TORTURE_BASIC
@@ -33,6 +28,7 @@ PRIVATE_PROTO_HEADER = \
                basic/proto.h
 OBJ_FILES = \
                basic/base.o \
+               basic/misc.o \
                basic/scanner.o \
                basic/utable.o \
                basic/charset.o \
@@ -49,14 +45,18 @@ OBJ_FILES = \
                basic/delaywrite.o \
                basic/attr.o \
                basic/properties.o 
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB 
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB POPT_CREDENTIALS \
+               TORTURE_UTIL LIBCLI_RAW \
+               TORTURE_RAW
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
 #################################
 # Start SUBSYSTEM TORTURE_RAW
-[SUBSYSTEM::TORTURE_RAW]
+[MODULE::TORTURE_RAW]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_raw_init
 PRIVATE_PROTO_HEADER = \
                raw/proto.h
 OBJ_FILES = \
@@ -77,32 +77,42 @@ OBJ_FILES = \
                raw/context.o \
                raw/write.o \
                raw/lock.o \
+               raw/pingpong.o \
+               raw/lockbench.o \
+               raw/openbench.o \
                raw/rename.o \
                raw/eas.o \
                raw/streams.o \
                raw/acls.o \
                raw/seek.o \
-               raw/composite.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB LIBCLI_LSA
+               raw/samba3hide.o \
+               raw/samba3misc.o \
+               raw/composite.o \
+               raw/raw.o
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
+               POPT_CREDENTIALS TORTURE_UTIL
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
 include smb2/config.mk
 
-[MODULE::torture_com]
-INIT_FUNCTION = torture_com_init
-SUBSYSTEM = torture
-PRIVATE_PROTO_HEADER = \
-               com/proto.h
-OBJ_FILES = \
-               com/simple.o
-REQUIRED_SUBSYSTEMS = \
-               com dcom
+[SUBSYSTEM::TORTURE_NDR]
+PRIVATE_PROTO_HEADER = ndr/proto.h
+OBJ_FILES = ndr/ndr.o \
+                       ndr/winreg.o \
+                       ndr/atsvc.o \
+                       ndr/lsa.o \
+                       ndr/epmap.o \
+                       ndr/dfs.o \
+                       ndr/netlogon.o \
+                       ndr/drsuapi.o \
+                       ndr/spoolss.o \
+                       ndr/samr.o
 
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-OUTPUT_TYPE = MERGEDOBJ
+#OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = torture
 INIT_FUNCTION = torture_rpc_init
 PRIVATE_PROTO_HEADER = \
@@ -113,7 +123,6 @@ OBJ_FILES = \
                rpc/lsa_lookup.o \
                rpc/session_key.o \
                rpc/echo.o \
-               rpc/dcom.o \
                rpc/dfs.o \
                rpc/drsuapi.o \
                rpc/drsuapi_cracknames.o \
@@ -140,76 +149,106 @@ OBJ_FILES = \
                rpc/netlogon.o \
                rpc/samlogon.o \
                rpc/samsync.o \
-               rpc/rot.o \
                rpc/bind.o \
                rpc/dssetup.o \
                rpc/alter_context.o \
                rpc/bench.o \
-               rpc/rpc.o
-REQUIRED_SUBSYSTEMS = \
-               NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
+               rpc/samba3rpc.o \
+               rpc/rpc.o \
+               rpc/async_bind.o \
+               rpc/handles.o
+PRIVATE_DEPENDENCIES = \
+               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_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
+               RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
                RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
                RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
-               RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET
+               RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \
+               LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
-[SUBSYSTEM::TORTURE_RAP]
+[MODULE::TORTURE_RAP]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_rap_init
 PRIVATE_PROTO_HEADER = \
                rap/proto.h
 OBJ_FILES = \
                rap/rap.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB
+PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
 #################################
 
 #################################
 # Start SUBSYSTEM TORTURE_AUTH
-[SUBSYSTEM::TORTURE_AUTH]
+[MODULE::TORTURE_AUTH]
+SUBSYSTEM = torture
 PRIVATE_PROTO_HEADER = \
                auth/proto.h
 OBJ_FILES = \
                auth/ntlmssp.o \
                auth/pac.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB gensec auth
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB gensec auth LIBSAMBA3 KERBEROS \
+               POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_AUTH
 #################################
 
 include local/config.mk
 
 #################################
-# Start SUBSYSTEM TORTURE_NBENCH
-[SUBSYSTEM::TORTURE_NBENCH]
+# Start MODULE TORTURE_NBENCH
+[MODULE::TORTURE_NBENCH]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_nbench_init
+PRIVATE_DEPENDENCIES = TORTURE_UTIL 
 PRIVATE_PROTO_HEADER = \
                nbench/proto.h
 OBJ_FILES = \
                nbench/nbio.o \
                nbench/nbench.o
-# End SUBSYSTEM TORTURE_NBENCH
+# End MODULE TORTURE_NBENCH
+#################################
+
+#################################
+# Start MODULE TORTURE_UNIX
+[MODULE::TORTURE_UNIX]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_unix_init
+PRIVATE_DEPENDENCIES = TORTURE_UTIL 
+PRIVATE_PROTO_HEADER = \
+               unix/proto.h
+OBJ_FILES = \
+               unix/unix.o \
+               unix/whoami.o \
+               unix/unix_info2.o
+# End MODULE TORTURE_UNIX
 #################################
 
 #################################
 # Start SUBSYSTEM TORTURE_LDAP
-[SUBSYSTEM::TORTURE_LDAP]
+[MODULE::TORTURE_LDAP]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_ldap_init
 PRIVATE_PROTO_HEADER = \
                ldap/proto.h
 OBJ_FILES = \
                ldap/common.o \
                ldap/basic.o \
+               ldap/schema.o \
+               ldap/uptodatevector.o \
                ldap/cldap.o \
                ldap/cldapbench.o
-REQUIRED_SUBSYSTEMS = \
-               LIBCLI_LDAP LIBCLI_CLDAP
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_LDAP
 #################################
 
 #################################
 # Start SUBSYSTEM TORTURE_NBT
-[SUBSYSTEM::TORTURE_NBT]
+[MODULE::TORTURE_NBT]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_nbt_init
 PRIVATE_PROTO_HEADER = \
                nbt/proto.h
 OBJ_FILES = \
@@ -219,9 +258,9 @@ OBJ_FILES = \
                nbt/winsbench.o \
                nbt/winsreplication.o \
                nbt/dgram.o \
-               nbt/browse.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB LIBCLI_NBT LIBCLI_WREPL
+               nbt/nbt.o
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc
 # End SUBSYSTEM TORTURE_NBT
 #################################
 
@@ -236,13 +275,20 @@ OBJ_FILES = \
                libnet/libnet.o \
                libnet/userinfo.o \
                libnet/userman.o \
+               libnet/groupinfo.o \
                libnet/domain.o \
                libnet/libnet_lookup.o \
                libnet/libnet_user.o \
+               libnet/libnet_group.o \
                libnet/libnet_share.o \
-               libnet/libnet_rpc.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSAMBA-NET
+               libnet/libnet_rpc.o \
+               libnet/libnet_domain.o \
+               libnet/libnet_BecomeDC.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-NET \
+               smbcalls \
+               POPT_CREDENTIALS \
+               torture_rpc
 # End SUBSYSTEM TORTURE_NET
 #################################
 
@@ -252,11 +298,14 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                smbtorture.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                torture \
                LIBPOPT \
                POPT_SAMBA \
-               POPT_CREDENTIALS
+               POPT_CREDENTIALS \
+               dcerpc \
+               LIBCLI_SMB \
+               SMBREADLINE
 MANPAGE = man/smbtorture.1
 # End BINARY smbtorture
 #################################
@@ -267,13 +316,14 @@ MANPAGE = man/smbtorture.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                gentest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
                POPT_CREDENTIALS \
-               LIBSMB
+               LIBCLI_SMB \
+               LIBCLI_RAW
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
@@ -284,13 +334,13 @@ MANPAGE = man/gentest.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                masktest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
                POPT_CREDENTIALS \
-               LIBSMB
+               LIBCLI_SMB
 MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
@@ -301,10 +351,10 @@ MANPAGE = man/masktest.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                locktest.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB \
-               LIBSAMBA-CONFIG \
-               LIBSAMBA-UTIL
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-UTIL \
+               LIBCLI_SMB \
+               LIBSAMBA-CONFIG
 MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
@@ -312,11 +362,34 @@ MANPAGE = man/locktest.1
 GCOV_FLAGS = -ftest-coverage -fprofile-arcs
 GCOV_LIBS = -lgcov
 
-gcov: 
-       @$(MAKE) test \
+COV_TARGET = test
+
+test_cov:
+       @$(MAKE) $(COV_TARGET) \
+               HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
                CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-               LD_FLAGS="$(LD_FLAGS) $(GCOV_FLAGS)" \
-               LIBS="$(LIBS) $(GCOV_LIBS)"
+               LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
+               SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
+
+gcov: test_cov
        for I in $(sort $(dir $(ALL_OBJS))); \
                do $(GCOV) -p -o $$I $$I/*.c; \
        done
+
+lcov-split: 
+       rm -f samba.info
+       @$(MAKE) $(COV_TARGET) \
+               HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
+               CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
+               LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
+               SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
+               TEST_OPTIONS="--analyse-cmd=\"lcov --base-directory `pwd` --directory . --capture --output-file samba.info -t\""
+       -rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
+       genhtml -o coverage samba.info
+
+lcov: test_cov
+       -rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
+       lcov --base-directory `pwd` --directory . --capture --output-file samba.info
+       genhtml -o coverage samba.info
+
+testcov-html:: lcov