Split Dr.Memory suppressions into two parts: lightmode-only and all the others

tools/valgrind/valgrind_test.py

 # Copyright (c) 2011 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.
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
 
 import datetime
 import glob
@@ skipping 810 matching lines @@
       logging.info("Excluding python children")
       drconfig_cmd += ["-reg", "python.exe", "-norun"]
     if run_drconfig:
       drconfig_retcode = common.RunSubprocess(drconfig_cmd, self._timeout)
       if drconfig_retcode:
         logging.error("Configuring whether to follow python children failed " \
                       "with %d.", drconfig_retcode)
         raise RuntimeError, "Configuring python children failed "
 
     suppression_count = 0
-    for suppression_file in self._options.suppressions:
+    supp_files = self._options.suppressions
+    if self.handle_uninits_and_leaks:
+      supp_files += [s.replace(".txt", "_full.txt") for s in supp_files]
+    for suppression_file in supp_files:
       if os.path.exists(suppression_file):
         suppression_count += 1
         proc += ["-suppress", common.NormalizeWindowsPath(suppression_file)]
 
     if not suppression_count:
       logging.warning("WARNING: NOT USING SUPPRESSIONS!")
 
     # Un-comment to dump Dr.Memory events on error
     #proc += ["-dr_ops", "-dumpcore_mask 0x8bff"]
 
@@ skipping 350 matching lines @@
       return Asan()
     try:
       platform_name = common.PlatformNames()[0]
     except common.NotImplementedError:
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)