Suppress all reports from waterfall_drmem.sh.

tools/valgrind/test_suppressions.py

 # Copyright (c) 2012 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.
 
 from collections import defaultdict
 import os
 import re
 import sys
 
 import path_utils
@@ skipping 80 matching lines @@
     if all([re.search("%20Mac%20|mac_valgrind", url)
             for url in all_reports[r]]):
       # Include mac suppressions if the report is only present on Mac
       cur_supp += mac_suppressions
     elif all([re.search("Windows%20", url) for url in all_reports[r]]):
       # Include win32 suppressions if the report is only present on Windows
       cur_supp += win_suppressions
     elif all([re.search("%20Heapcheck", url)
               for url in all_reports[r]]):
       cur_supp += heapcheck_suppressions
-    elif all(["DrMemory%20full" in url for url in all_reports[r]]):
-      cur_supp += drmem_suppressions + drmem_full_suppressions
-    elif all(["DrMemory" in url for url in all_reports[r]]):
+    if all(["DrMemory" in url for url in all_reports[r]]):
       cur_supp += drmem_suppressions
+    if all(["DrMemory%20full" in url for url in all_reports[r]]):
+      cur_supp += drmem_full_suppressions
 
     match = False
     for s in cur_supp:
       if s.Match(r.split("\n")):
         match = True
         break
     if not match:
       reports_count += 1
       print "==================================="
       print "This report observed at"
       for url in all_reports[r]:
         print "  %s" % url
       print "didn't match any suppressions:"
       print "Suppression (error hash=#%s#):" % (report_hashes[r])
       print r
       print "==================================="
 
   if reports_count > 0:
     print ("%d unique reports don't match any of the suppressions" %
            reports_count)
   else:
     print "Congratulations! All reports are suppressed!"
     # TODO(timurrrr): also make sure none of the old suppressions
     # were narrowed too much.
 
 
 if __name__ == "__main__":
   main(sys.argv[1:])