r24872: Use torture API a bit more
[kai/samba.git] / source4 / torture / config.mk
index 82fbf41ed12dfce88eedb1dd6b99b9027ac9289f..fc85cc160aed50726d81a4fbcaefb7c23bd1a7db 100644 (file)
@@ -7,7 +7,6 @@ PUBLIC_HEADERS = torture.h ui.h
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
                torture.o \
-               subunit.o \
                ui.o
 PUBLIC_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
@@ -46,10 +45,10 @@ OBJ_FILES = \
                basic/delaywrite.o \
                basic/attr.o \
                basic/properties.o 
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                LIBCLI_SMB POPT_CREDENTIALS \
-               TORTURE_UTIL LIBCLI_RAW
-PRIVATE_DEPENDENCIES = TORTURE_RAW
+               TORTURE_UTIL LIBCLI_RAW \
+               TORTURE_RAW
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
@@ -78,7 +77,9 @@ 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 \
@@ -88,15 +89,27 @@ OBJ_FILES = \
                raw/samba3misc.o \
                raw/composite.o \
                raw/raw.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
-               POPT_CREDENTIALS
-PRIVATE_DEPENDENCIES = TORTURE_UTIL
+               POPT_CREDENTIALS TORTURE_UTIL
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
 include smb2/config.mk
 
+[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 = INTEGRATED
@@ -110,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 \
@@ -137,23 +149,22 @@ 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/samba3rpc.o \
                rpc/rpc.o \
-               rpc/async_bind.o
-PUBLIC_DEPENDENCIES = \
-               NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
+               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 \
-               LIBCLI_AUTH POPT_CREDENTIALS
-PRIVATE_DEPENDENCIES = TORTURE_LDAP TORTURE_UTIL TORTURE_RAP
+               LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
@@ -164,9 +175,7 @@ PRIVATE_PROTO_HEADER = \
                rap/proto.h
 OBJ_FILES = \
                rap/rap.o
-PRIVATE_DEPENDENCIES = TORTURE_UTIL
-PUBLIC_DEPENDENCIES = \
-               LIBCLI_SMB
+PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
 #################################
 
@@ -179,7 +188,7 @@ PRIVATE_PROTO_HEADER = \
 OBJ_FILES = \
                auth/ntlmssp.o \
                auth/pac.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                LIBCLI_SMB gensec auth LIBSAMBA3 KERBEROS \
                POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_AUTH
@@ -201,6 +210,21 @@ OBJ_FILES = \
 # 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
 [MODULE::TORTURE_LDAP]
@@ -212,9 +236,10 @@ OBJ_FILES = \
                ldap/common.o \
                ldap/basic.o \
                ldap/schema.o \
+               ldap/uptodatevector.o \
                ldap/cldap.o \
                ldap/cldapbench.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_LDAP
 #################################
@@ -234,9 +259,8 @@ OBJ_FILES = \
                nbt/winsreplication.o \
                nbt/dgram.o \
                nbt/nbt.o
-PUBLIC_DEPENDENCIES = \
-               LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL
-PRIVATE_DEPENDENCIES = torture_rpc
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL torture_rpc
 # End SUBSYSTEM TORTURE_NBT
 #################################
 
@@ -251,18 +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 \
                libnet/libnet_domain.o \
                libnet/libnet_BecomeDC.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-NET \
                smbcalls \
-               POPT_CREDENTIALS
-PRIVATE_DEPENDENCIES = torture_rpc
+               POPT_CREDENTIALS \
+               torture_rpc
 # End SUBSYSTEM TORTURE_NET
 #################################
 
@@ -336,18 +362,34 @@ MANPAGE = man/locktest.1
 GCOV_FLAGS = -ftest-coverage -fprofile-arcs
 GCOV_LIBS = -lgcov
 
+COV_TARGET = test
+
 test_cov:
-       @$(MAKE) test \
+       @$(MAKE) $(COV_TARGET) \
                HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
                CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-               LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(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}
+       -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