Remove Mac-specific sanity test expectations since "-O1 -g ..." is back thanks to the new 10.6 Valgrind builder

This patch partly reverts r53308 and r53408
BUG=49253
TEST=tested locally on Linux and Mac
Review URL: http://codereview.chromium.org/3158024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56662 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 72 deletions

diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 31389f0..df1365d 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -1384,54 +1384,6 @@
    fun:_ZN8remoting8Capturer19CaptureInvalidRectsEP14CallbackRunnerI6Tuple1I13scoped_refptrINS_11CaptureDataEEEE
    fun:_ZN8remoting28CapturerMacTest_Capture_Test8TestBodyEv
 }
-
-# See tools/valgrind/memcheck_analyze.py before modifying sanity tests.
-{
-   bug_49253 Memcheck sanity test 04 (malloc/write left) or Memcheck sanity test 05 (malloc/write right) on Mac.
-   Memcheck:Addr1
-   fun:_Z14MakeSomeErrorsPcm
-   fun:_ZN43ToolsSanityTest_AccessesToMallocMemory_Test8TestBodyEv
-   fun:_ZN7testing4Test3RunEv
-   fun:_ZN7testing8internal12TestInfoImpl3RunEv
-   fun:_ZN7testing8TestCase3RunEv
-   fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
-   fun:_ZN9TestSuite3RunEv
-   fun:main
-}
-{
-   bug_49253 Memcheck sanity test 13 (single element deleted with []) on Mac.
-   Memcheck:Free
-   fun:_ZdaPv
-   fun:_ZN7testing4Test3RunEv
-   fun:_ZN7testing8internal12TestInfoImpl3RunEv
-   fun:_ZN7testing8TestCase3RunEv
-   fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
-   fun:_ZN9TestSuite3RunEv
-   fun:main
-}
-{
-   bug_49253 Memcheck sanity test 08 (new/write left) or Memcheck sanity test 09 (new/write right) on Mac.
-   Memcheck:Addr1
-   fun:_Z14MakeSomeErrorsPcm
-   fun:_ZN40ToolsSanityTest_AccessesToNewMemory_Test8TestBodyEv
-   fun:_ZN7testing4Test3RunEv
-   fun:_ZN7testing8internal12TestInfoImpl3RunEv
-   fun:_ZN7testing8TestCase3RunEv
-   fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
-   fun:_ZN9TestSuite3RunEv
-   fun:main
-}
-{
-   bug_49253 Memcheck sanity test 12 (array deleted without []) on Mac.
-   Memcheck:Free
-   fun:_ZdlPv
-   fun:_ZN7testing4Test3RunEv
-   fun:_ZN7testing8internal12TestInfoImpl3RunEv
-   fun:_ZN7testing8TestCase3RunEv
-   fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
-   fun:_ZN9TestSuite3RunEv
-   fun:main
-}
 {
    bug_49268_2
    Memcheck:Leak
diff --git a/tools/valgrind/memcheck_analyze.py b/tools/valgrind/memcheck_analyze.py
index f3ebad0..98bfbd8 100755
--- a/tools/valgrind/memcheck_analyze.py
+++ b/tools/valgrind/memcheck_analyze.py
@@ -314,7 +314,7 @@ class MemcheckAnalyzer:
   ''' Given a set of Valgrind XML files, parse all the errors out of them,
   unique them and output the results.'''
 
-  SANITY_TEST_SUPPRESSIONS_LINUX = {
+  SANITY_TEST_SUPPRESSIONS = {
       "Memcheck sanity test 01 (memory leak).": 1,
       "Memcheck sanity test 02 (malloc/read left).": 1,
       "Memcheck sanity test 03 (malloc/read right).": 1,
@@ -330,20 +330,6 @@ class MemcheckAnalyzer:
       "Memcheck sanity test 13 (single element deleted with []).": 1,
   }
 
-  SANITY_TEST_SUPPRESSIONS_MAC = {
-      "Memcheck sanity test 01 (memory leak).": 1,
-      "Memcheck sanity test 02 (malloc/read left).": 1,
-      "Memcheck sanity test 03 (malloc/read right).": 1,
-      "Memcheck sanity test 06 (new/read left).": 1,
-      "Memcheck sanity test 07 (new/read right).": 1,
-      "Memcheck sanity test 10 (write after free).": 1,
-      "Memcheck sanity test 11 (write after delete).": 1,
-      "bug_49253 Memcheck sanity test 12 (array deleted without []) on Mac.": 1,
-      "bug_49253 Memcheck sanity test 13 (single element deleted with []) on Mac.": 1,
-      "bug_49253 Memcheck sanity test 04 (malloc/write left) or Memcheck sanity test 05 (malloc/write right) on Mac.": 2,
-      "bug_49253 Memcheck sanity test 08 (new/write left) or Memcheck sanity test 09 (new/write right) on Mac.": 2,
-  }
-
   # Max time to wait for memcheck logs to complete.
   LOG_COMPLETION_TIMEOUT = 180.0
 
@@ -527,15 +513,7 @@ class MemcheckAnalyzer:
     print "Suppressions used:"
     print "  count name"
 
-    if common.IsLinux():
-      remaining_sanity_supp = MemcheckAnalyzer.SANITY_TEST_SUPPRESSIONS_LINUX
-    elif common.IsMac():
-      remaining_sanity_supp = MemcheckAnalyzer.SANITY_TEST_SUPPRESSIONS_MAC
-    else:
-      remaining_sanity_supp = {}
-      if check_sanity:
-        logging.warn("No sanity test list for platform %s", sys.platform)
-
+    remaining_sanity_supp = MemcheckAnalyzer.SANITY_TEST_SUPPRESSIONS
     for (name, count) in sorted(suppcounts.items(),
                                 key=lambda (k,v): (v,k)):
       print "%7d %s" % (count, name)