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

(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)

diff --git a/source4/dsdb/samdb/ldb_modules/normalise.c b/source4/dsdb/samdb/ldb_modules/normalise.c
index efc9bb29e8b707c3b95cfc957510187e6d783615..7e3b63a145079c14d5aa88227ccf03f2751fe72c 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/normalise.c
+++ b/source4/dsdb/samdb/ldb_modules/normalise.c
@@ -105,6 +105,7 @@ static int normalise_search_callback(struct ldb_context *ldb, void *context, str
                if (!attribute) {
                        continue;
                }
+               /* Look to see if this attributeSyntax is a DN */
                if ((strcmp(attribute->attributeSyntax_oid, "2.5.5.1") != 0) &&
                    (strcmp(attribute->attributeSyntax_oid, "2.5.5.7") != 0)) {
                        continue;

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index cc9340e6b9b8e134b295b7fe4d44847cef47d227..82e32e1ece34a4c49d2ed8bd474e6ab4e3391d54 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -370,21 +370,20 @@ MANPAGE = man/locktest.1
 # 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))); \
@@ -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