SConstruct: improved lcov cleaning

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index a5de9b2..c64ab9a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -52,6 +52,7 @@ env.Append(
    LIBS                   = [ '$LIBSENF$LIBADDSUFFIX', 'rt', '$BOOSTREGEXLIB', 
                               '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', '$BOOSTFSLIB' ], 
    TEST_EXTRA_LIBS        = [  ],
+   VALGRINDARGS           = [ '--num-callers=50' ],
 
    PREFIX                 = '#/dist',
    LIBINSTALLDIR          = '$PREFIX${syslayout and "/lib" or ""}',
@@ -169,11 +170,12 @@ env.PhonyTarget('prepare', [], [])
 #### valgrind
 for test in env.FindAllBoostUnitTests():
     stamp = env.Command(test[0].dir.File('.test-valgrind.stamp'), 
-                        [ test[0].dir.File('.test.bin'), test ],
+                        [ test[0].dir.File('.test.bin'), 'tools/valgrind.sup' ],
                         [ """valgrind --tool=memcheck 
                                       --error-exitcode=99 
-                                      --suppressions=tools/valgrind.sup 
-                                          $SOURCE $BOOSTTESTARGS;
+                                      --suppressions=${SOURCES[1]}
+                                      $VALGRINDARGS
+                                          ${SOURCES[0]} $BOOSTTESTARGS;
                              [ $$? -ne 99 ] || exit 1""".replace("\n"," "),
                           Touch("$TARGET") ])
     alias = env.Command(test[0].dir.File('valgrind'), stamp, [ env.NopAction() ])
@@ -182,16 +184,20 @@ for test in env.FindAllBoostUnitTests():
 ### lcov
 env.PhonyTarget('lcov', [], [
         '$SCONS debug=1 CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests',
-        '$LCOV --directory $TOPDIR/senf --capture --output-file /tmp/senf_lcov.info --base-directory $TOPDIR',
+        '$LCOV --follow --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' ])
-
+if env.GetOption('clean'): 
+    env.Depends('lcov', 'all_tests')
+env.Clean('lcov', [ os.path.join(path,f)
+                    for path, subdirs, files in os.walk('.')
+                    for pattern in ['*.gcno', '*.gcda', '*.gcov']
+                    for f in fnmatch.filter(files,pattern) ] + 
+                  [ 'lcov.info', env.Dir('doc/lcov') ])
+    
 #### clean
-env.Clean('all', '.prepare-stamp')
-env.Clean('all', libsenf)
-env.Clean('all', env.Dir('dist'))
-env.Clean('all', 'lcov.info')
+env.Clean('all', ('.prepare-stamp', libsenf, env.Dir('dist'), 'lcov.info', env.Dir('doc/lcov') ))
 
 if env.GetOption('clean'):
     env.Clean('all', [ os.path.join(path,f)