From 50b03741f7939ef1da5f829abfb27dd7b5765f21 Mon Sep 17 00:00:00 2001 From: Leif Walsh <leif@tokutek.com> Date: Wed, 17 Apr 2013 00:01:09 -0400 Subject: [PATCH] refs #5368 add some osx specific suppressions to the suppressions file, and also to tokuvalgrind because things are a little rocky on osx these days git-svn-id: file:///svn/toku/tokudb@48125 c7de825b-a66e-492c-adef-691d508d4ae1 --- ft/valgrind.suppressions | 33 ++++++++++++++++++++++++++++----- scripts/tokugrind | 7 ++----- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ft/valgrind.suppressions b/ft/valgrind.suppressions index 676ca442bb..15d91fb922 100644 --- a/ft/valgrind.suppressions +++ b/ft/valgrind.suppressions @@ -154,21 +154,18 @@ Memcheck:Leak ... obj:/usr/lib/dyld - ... } { dyld_on_OSX Memcheck:Value8 ... obj:/usr/lib/dyld - ... } { dyld_on_OSX Memcheck:Cond ... obj:/usr/lib/dyld - ... } { ctime_on_OSX @@ -177,7 +174,6 @@ obj:/usr/lib/system/libsystem_c.dylib ... fun:asctime_r - ... } { ctime_on_OSX @@ -186,7 +182,6 @@ obj:/usr/lib/system/libsystem_c.dylib ... fun:ctime - ... } { pthread_join_on_OSX @@ -194,5 +189,33 @@ ... obj:/usr/lib/system/libsystem_c.dylib fun:pthread_join +} +{ + pthread_start_on_OSX + Memcheck:Leak + ... + fun:_pthread_start + obj:/usr/lib/system/libsystem_c.dylib +} +{ + printf_etc_on_OSX + Memcheck:Leak + ... + fun:__dtoa + ... + obj:/usr/lib/system/libsystem_c.dylib +} +{ + printf_etc_on_OSX + Memcheck:Leak + ... + fun:__smakebuf + ... + obj:/usr/lib/system/libsystem_c.dylib +} +{ + popen_on_OSX + Memcheck:Leak ... + fun:popen$DARWIN_EXTSN } diff --git a/scripts/tokugrind b/scripts/tokugrind index 3ed2cb9a5b..00298f5e1f 100755 --- a/scripts/tokugrind +++ b/scripts/tokugrind @@ -38,7 +38,8 @@ fi valgrind $args exitcode=$? if [ $exitcode = 0 ] ; then - lines=`cat $logfile | wc -l` + # ignore "empty" valgrind lines, and ignore the warning about not running well on OSX 10.8 that start with WARNING: + lines=`grep -v '==\ WARNING:\ ' $logfile | grep -v '--[0-9]\+:[0-9]\+:syswrap-\ WARNING:\ Ignoring\ sigreturn\(\ \.\.\.,\ UC_RESET_ALT_STACK\ \);' | grep -v '^==[0-9]\+==\ $' | grep -v '^$' | grep -v '^UNKNOWN\ task\ message\ \[id\ 3403,\ to\ mach_task_self(),\ reply' | wc -l` if [ $lines -ne 0 ] ; then exitcode=$errorexitcode fi @@ -50,7 +51,3 @@ if [ $createlogfile != 0 ] ; then fi exit $exitcode - - - - -- 2.30.9