Remove Mac-specific sanity test expectations since "-O1 -g ..." is back thank...

tools/valgrind/memcheck_analyze.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # memcheck_analyze.py
 
 ''' Given a valgrind XML file, parses errors and uniques them.'''
 
 import gdb_helper
@@ skipping 296 matching lines @@
       return False
     if '</valgrindoutput>' in line:
       # valgrind often has garbage after </valgrindoutput> upon crash
       f.truncate()
       return True
 
 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,
       "Memcheck sanity test 04 (malloc/write left).": 1,
       "Memcheck sanity test 05 (malloc/write right).": 1,
       "Memcheck sanity test 06 (new/read left).": 1,
       "Memcheck sanity test 07 (new/read right).": 1,
       "Memcheck sanity test 08 (new/write left).": 1,
       "Memcheck sanity test 09 (new/write right).": 1,
       "Memcheck sanity test 10 (write after free).": 1,
       "Memcheck sanity test 11 (write after delete).": 1,
       "Memcheck sanity test 12 (array deleted without []).": 1,
       "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
 
   def __init__(self, source_dir, show_all_leaks=False, use_gdb=False):
     '''Create a parser for Memcheck logs.
 
     Args:
       source_dir: Path to top of source tree for this build
       show_all_leaks: Whether to show even less important leaks
       use_gdb: Whether to use gdb to resolve source filenames and line numbers
@@ skipping 163 matching lines @@
 
     if parse_failed:
       logging.error("FAIL! Couldn't parse Valgrind output file")
       return -2
 
     is_sane = False
     print "-----------------------------------------------------"
     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)
       if name in remaining_sanity_supp and remaining_sanity_supp[name] == count:
         del remaining_sanity_supp[name]
     if len(remaining_sanity_supp) == 0:
       is_sane = True
     print "-----------------------------------------------------"
     sys.stdout.flush()
 
@@ skipping 37 matching lines @@
     parser.error("no filename specified")
   filenames = args
 
   analyzer = MemcheckAnalyzer(options.source_dir, use_gdb=True)
   retcode = analyzer.Report(filenames)
 
   sys.exit(retcode)
 
 if __name__ == "__main__":
   _main()