Merge to XFA: Add Dr. Memory suppression file for pdfium tests

tools/drmemory/scripts/pdfium_tests.py

 #!/usr/bin/env python
 # 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.
 
 ''' Runs various chrome tests through valgrind_test.py.'''
 
 import glob
 import logging
 import optparse
@@ skipping 79 matching lines @@
     '''Generates the default command array that most tests will use.'''
     if exe and common.IsWindows():
       exe += '.exe'
 
     cmd = list(self._command_preamble)
 
     # Find all suppressions matching the following pattern:
     # tools/valgrind/TOOL/suppressions[_PLATFORM].txt
     # and list them with --suppressions= prefix.
     script_dir = path_utils.ScriptDir()
-    tool_name = tool.ToolName();
-    suppression_file = os.path.join(script_dir, tool_name, "suppressions.txt")
+    suppression_file = os.path.join(script_dir, "..", "suppressions.txt")
     if os.path.exists(suppression_file):
       cmd.append("--suppressions=%s" % suppression_file)
     # Platform-specific suppression
     for platform in common.PlatformNames():
       platform_suppression_file = \
-          os.path.join(script_dir, tool_name, 'suppressions_%s.txt' % platform)
+          os.path.join(script_dir, "..", 'suppressions_%s.txt' % platform)
       if os.path.exists(platform_suppression_file):
         cmd.append("--suppressions=%s" % platform_suppression_file)
 
     if self._options.valgrind_tool_flags:
       cmd += self._options.valgrind_tool_flags.split(" ")
     if self._options.keep_logs:
       cmd += ["--keep_logs"]
     if valgrind_test_args != None:
       for arg in valgrind_test_args:
         cmd.append(arg)
     if exe:
       self._EnsureBuildDirFound()
       exe_path = os.path.join(self._options.build_dir, exe)
       if not os.path.exists(exe_path):
         raise ExecutableNotFound("Couldn't find '%s'" % exe_path)
 
-      # Make sure we don't try to test ASan-built binaries
-      # with other dynamic instrumentation-based tools.
-      # TODO(timurrrr): also check TSan and MSan?
-      # `nm` might not be available, so use try-except.
-      try:
-        # Do not perform this check on OS X, as 'nm' on 10.6 can't handle
-        # binaries built with Clang 3.5+.
-        if not common.IsMac():
-          nm_output = subprocess.check_output(["nm", exe_path])
-          if nm_output.find("__asan_init") != -1:
-            raise BadBinary("You're trying to run an executable instrumented "
-                            "with AddressSanitizer under %s. Please provide "
-                            "an uninstrumented executable." % tool_name)
-      except OSError:
-        pass
-
       cmd.append(exe_path)
       # Valgrind runs tests slowly, so slow tests hurt more; show elapased time
       # so we can find the slowpokes.
       cmd.append("--gtest_print_time")
       # Built-in test launcher for gtest-based executables runs tests using
       # multiple process by default. Force the single-process mode back.
       cmd.append("--single-process-tests")
     if self._options.gtest_repeat:
       cmd.append("--gtest_repeat=%s" % self._options.gtest_repeat)
     if self._options.gtest_shuffle:
@@ skipping 211 matching lines @@
 
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(_main())