More valgrind updates

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

diff --git a/SConstruct b/SConstruct
index a5de9b2..b6dab2c 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', test ],
                         [ """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() ])

diff --git a/tools/valgrind.sup b/tools/valgrind.sup
index 223c0be..cbc5426 100644 (file)
--- a/tools/valgrind.sup
+++ b/tools/valgrind.sup
@@ -106,11 +106,11 @@
    if_indextoname-suppression-1
    Memcheck:Param
    ioctl(SIOCGIFINDEX)
-   obj:/lib/ld-2.3.6.so
+   obj:/lib/ld-*.so
 }
 
 {
-   boost_unittest_sigaltstack
+   boost_unittest_sigaltstack-suppression-1
    Memcheck:Param
    sigaltstack(ss)
    obj:/lib/ld-2.7.so