Ignore kinit with pkinit test failures for now.

[ira/wip.git] / source / torture / config.mk

diff --git a/source/torture/config.mk b/source/torture/config.mk
index 00a31745f4abbec865cbb923fa677a966df2b999..2666a1d0be3d317a6bf8e6ab6a92714344041a68 100644 (file)
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -1,8 +1,8 @@
 # TORTURE subsystem
 [LIBRARY::torture]
-DESCRIPTION = Samba torture (test) suite
 SO_VERSION = 0
 VERSION = 0.0.1
+PC_FILE = torture.pc
 PUBLIC_HEADERS = torture.h ui.h
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
@@ -14,7 +14,7 @@ PUBLIC_DEPENDENCIES = \
                LIBTALLOC 
 
 [SUBSYSTEM::TORTURE_UTIL]
-OBJ_FILES = util.o util_smb.o
+OBJ_FILES = util_smb.o
 PRIVATE_DEPENDENCIES = LIBCLI_RAW
 PUBLIC_PROTO_HEADER = util.h
 PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
@@ -88,7 +88,8 @@ OBJ_FILES = \
                raw/samba3hide.o \
                raw/samba3misc.o \
                raw/composite.o \
-               raw/raw.o
+               raw/raw.o \
+               raw/offline.o
 PRIVATE_DEPENDENCIES = \
                LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
                POPT_CREDENTIALS TORTURE_UTIL
@@ -130,6 +131,7 @@ OBJ_FILES = \
                rpc/dssync.o \
                rpc/spoolss.o \
                rpc/spoolss_notify.o \
+               rpc/spoolss_win.o \
                rpc/unixinfo.o \
                rpc/samr.o \
                rpc/samr_accessmask.o \
@@ -159,12 +161,13 @@ OBJ_FILES = \
                rpc/samba3rpc.o \
                rpc/rpc.o \
                rpc/async_bind.o \
-               rpc/handles.o
+               rpc/handles.o \
+               rpc/frsapi.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_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI \
-               RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
+               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 WB_HELPER LIBSAMBA-NET \
                LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP \
@@ -277,6 +280,7 @@ PRIVATE_PROTO_HEADER = \
                libnet/proto.h
 OBJ_FILES = \
                libnet/libnet.o \
+               libnet/utils.o \
                libnet/userinfo.o \
                libnet/userman.o \
                libnet/groupinfo.o \
@@ -364,17 +368,21 @@ MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
-GCOV_FLAGS = -ftest-coverage -fprofile-arcs
-GCOV_LIBS = -lgcov
+GCOV_CFLAGS = -ftest-coverage -fprofile-arcs
+GCOV_LDFLAGS = $(GCOV_CFLAGS) -lgcov
 
 COV_TARGET = test
 
+COV_VARS = \
+       CFLAGS="$(CFLAGS) $(GCOV_CFLAGS)" \
+       BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_LDFLAGS)" \
+       SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_LDFLAGS)" \
+       MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_LDFLAGS)" \
+       HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_CFLAGS)" \
+       HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_LDFLAGS)"
+
 test_cov:
-       @$(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)"
+       @$(MAKE) $(COV_TARGET) $(COV_VARS)
 
 gcov: test_cov
        for I in $(sort $(dir $(ALL_OBJS))); \
@@ -383,11 +391,7 @@ gcov: test_cov
 
 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)" \
+       @$(MAKE) $(COV_TARGET) $(COV_VARS) \
                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