summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-19 13:45:17 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-19 13:45:17 +0100
commit87847afce23fe09536246484dc9ca34db7df2930 (patch)
tree113d0a7ae81f64a060cc134a313c10150cd9f50f /source4
parent7d5987c2e035d1661f25294c26e3d81ba44def90 (diff)
parente51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (diff)
downloadsamba-87847afce23fe09536246484dc9ca34db7df2930.tar.gz
samba-87847afce23fe09536246484dc9ca34db7df2930.tar.bz2
samba-87847afce23fe09536246484dc9ca34db7df2930.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 8238415f3cf2d48601dd3102edfa2c438155f49a)
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/normalise.c1
-rw-r--r--source4/torture/config.mk19
2 files changed, 11 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/normalise.c b/source4/dsdb/samdb/ldb_modules/normalise.c
index efc9bb29e8..7e3b63a145 100644
--- 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 cc9340e6b9..82e32e1ece 100644
--- 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