Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet

(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)

diff --combined source4/torture/config.mk
index 32085400b75f3449377c694f4ce056bfa41075ca,cc9340e6b9b8e134b295b7fe4d44847cef47d227..82e32e1ece34a4c49d2ed8bd474e6ab4e3391d54
--- 1/source4/torture/config.mk
--- 2/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@@ -11,7 -11,8 +11,8 @@@ OBJ_FILES = 
  PUBLIC_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL \
-               LIBTALLOC 
+               LIBTALLOC \
+               LIBPOPT
  
  [SUBSYSTEM::TORTURE_UTIL]
  OBJ_FILES = util_smb.o util_provision.o
@@@ -95,8 -96,8 +96,8 @@@ PRIVATE_DEPENDENCIES = 
  # End SUBSYSTEM TORTURE_RAW
  #################################
  
- include smb2/config.mk
- include winbind/config.mk
+ mkinclude smb2/config.mk
+ mkinclude winbind/config.mk
  
  [SUBSYSTEM::TORTURE_NDR]
  PRIVATE_PROTO_HEADER = ndr/proto.h
@@@ -113,7 -114,7 +114,7 @@@ OBJ_FILES = ndr/ndr.o 
  
  [MODULE::torture_rpc]
  # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
- #OUTPUT_TYPE = INTEGRATED
+ #OUTPUT_TYPE = MERGED_OBJ
  SUBSYSTEM = torture
  INIT_FUNCTION = torture_rpc_init
  PRIVATE_PROTO_HEADER = \
@@@ -200,7 -201,7 +201,7 @@@ PRIVATE_DEPENDENCIES = 
  # End SUBSYSTEM TORTURE_AUTH
  #################################
  
- include local/config.mk
+ mkinclude local/config.mk
  
  #################################
  # Start MODULE TORTURE_NBENCH
@@@ -369,20 -370,21 +370,20 @@@ MANPAGE = man/locktest.
  # End BINARY locktest
  #################################
  
 -GCOV_CFLAGS = -ftest-coverage -fprofile-arcs
 -GCOV_LDFLAGS = $(GCOV_CFLAGS) -lgcov
 +GCOV_FLAGS = --coverage
  
  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)"
 +      CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
 +      BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_FLAGS)" \
 +      SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS)" \
 +      MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_FLAGS)" \
 +      HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_FLAGS)" \
 +      HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_FLAGS)"
  
  test_cov:
 -      @$(MAKE) $(COV_TARGET) $(COV_VARS)
 +      -$(MAKE) $(COV_TARGET) $(COV_VARS)
  
  gcov: test_cov
        for I in $(sort $(dir $(ALL_OBJS))); \
@@@ -394,12 -396,10 +395,12 @@@ lcov-split
        @$(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}
 +      -rm lib/policy/*/{lex,parse}.{gcda,gcno}
        genhtml -o coverage samba.info
  
  lcov: test_cov
        -rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
 +      -rm lib/policy/*/{lex,parse}.{gcda,gcno}
        lcov --base-directory `pwd` --directory . --capture --output-file samba.info
        genhtml -o coverage samba.info