[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-901-g837eb8a

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  837eb8a0bc011cd84bc7e8d2849028313d709928 (commit)
       via  7e49f75ee21adec321e0935c9cd4c2a96d7ef6d1 (commit)
       via  69af290c91c61cdaf821750d0d2dddf9cb1b8255 (commit)
      from  f6760fd161f568ef13a841a0210f130160a16c01 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 837eb8a0bc011cd84bc7e8d2849028313d709928
Merge: 7e49f75ee21adec321e0935c9cd4c2a96d7ef6d1 f6760fd161f568ef13a841a0210f130160a16c01
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Feb 19 14:45:23 2008 +1100

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

commit 7e49f75ee21adec321e0935c9cd4c2a96d7ef6d1
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Feb 19 14:44:10 2008 +1100

    To partially simplfy our gcov handling, move to the new --coverage option.
    
    Andrew Bartlett

commit 69af290c91c61cdaf821750d0d2dddf9cb1b8255
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Feb 19 09:36:56 2008 +1100

    Explain that these OIDs are DNs
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source/dsdb/samdb/ldb_modules/normalise.c |    1 +
 source/torture/config.mk                  |   19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/ldb_modules/normalise.c b/source/dsdb/samdb/ldb_modules/normalise.c
index efc9bb2..7e3b63a 100644
--- a/source/dsdb/samdb/ldb_modules/normalise.c
+++ b/source/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/source/torture/config.mk b/source/torture/config.mk
index cc9340e..82e32e1 100644
--- a/source/torture/config.mk
+++ b/source/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
 


-- 
Samba Shared Repository