[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1249-gae6af9e

[Andrew Bartlett]

The branch, master has been updated
       via  ae6af9ecbfce559a50d95853d6e66b8aa8788741 (commit)
       via  f5dfd1a9a68fda488c96176754a3b6462e8e4dba (commit)
      from  176302dc05cd67d013f3d153b9816329a175167e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ae6af9ecbfce559a50d95853d6e66b8aa8788741
Merge: f5dfd1a9a68fda488c96176754a3b6462e8e4dba 176302dc05cd67d013f3d153b9816329a175167e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 23 17:38:42 2009 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

commit f5dfd1a9a68fda488c96176754a3b6462e8e4dba
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 23 16:46:47 2009 +0200

    s4:test Include 'source4' in directories to find lcov in

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

Summary of changes:
 source4/torture/config.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 12cf62f..49830d2 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -353,7 +353,7 @@ gcov: test
 
 samba.info: test
 	-rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
-	lcov --base-directory `pwd` --directory ../nsswitch --directory ../libcli --directory ../librpc --directory ../lib --capture --output-file samba.info
+	lcov --base-directory `pwd` --directory . --directory ../nsswitch --directory ../libcli --directory ../librpc --directory ../lib --capture --output-file samba.info
 
 lcov: samba.info
 	genhtml -o coverage $<


-- 
Samba Shared Repository