Fix lcov target

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1387 270642c3-0616-0410-b53a-bc976706d245

diff --git a/.gitignore b/.gitignore
index c0de9c6..6d39273 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ doc/
 /linklint
 /TODO
 /dist/
+/lcov.info

diff --git a/SConstruct b/SConstruct
index ad342c9..fa07861 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -100,6 +100,7 @@ env.SetDefault(
     GENHTML           = "genhtml",
     SCONS             = "./tools/scons -j$CONCURRENCY_LEVEL",
     CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
+    TOPDIR            = env.Dir('#').abspath,
 )
 
 # Set variables from command line
@@ -181,9 +182,9 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """
 ### lcov
 env.PhonyTarget('lcov', [], [
         '$SCONS debug=1 CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests',
-        '$LCOV --directory . --capture --output-file /tmp/senf_lcov.info --base-directory .',
-        '$LCOV --output-file ${TARGETS[1]} --remove /tmp/senf_lcov.info \\*/include/\\*',
-        '$GENHTML --output-directory ${TARGETS[0]} --title all_tests ${TARGETS[1]}',
+        '$LCOV --directory $TOPDIR/senf --capture --output-file /tmp/senf_lcov.info --base-directory $TOPDIR',
+        '$LCOV --output-file lcov.info --remove /tmp/senf_lcov.info "*/include/*" "*/boost/*" "*.test.*" ',
+        '$GENHTML --output-directory doc/lcov --title all_tests lcov.info',
         'rm /tmp/senf_lcov.info' ])
 
 #### clean