| Index: tools/drmemory/scripts/pdfium_tests.py
|
| diff --git a/tools/drmemory/scripts/pdfium_tests.py b/tools/drmemory/scripts/pdfium_tests.py
|
| index 6cc7d57f534ac1da45946f357cc7aece086d42a5..5486b16046e0ef6e65cf0806f41e817cde6f7f3d 100644
|
| --- a/tools/drmemory/scripts/pdfium_tests.py
|
| +++ b/tools/drmemory/scripts/pdfium_tests.py
|
| @@ -97,14 +97,13 @@ class ChromeTests:
|
| # 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)
|
|
|
| @@ -121,22 +120,6 @@ class ChromeTests:
|
| 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.
|
|
|