Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / tools / valgrind / valgrind_test.py

diff --git a/src/tools/valgrind/valgrind_test.py b/src/tools/valgrind/valgrind_test.py
index be96b9d..29903d9 100644 (file)
--- a/src/tools/valgrind/valgrind_test.py
+++ b/src/tools/valgrind/valgrind_test.py
@@ -397,7 +397,7 @@ class ValgrindTool(BaseTool):
     # Valgrind doesn't play nice with the Chrome sandbox.  Empty this env var
     # set by runtest.py to disable the sandbox.
     if os.environ.get("CHROME_DEVEL_SANDBOX", None):
-      logging.info("Removing CHROME_DEVEL_SANDBOX fron environment")
+      logging.info("Removing CHROME_DEVEL_SANDBOX from environment")
       os.environ["CHROME_DEVEL_SANDBOX"] = ''
 
     # Handle --indirect_webkit_layout separately.
@@ -938,6 +938,10 @@ class DrMemory(BaseTool):
     # disable leak scan for now
     proc += ["-no_count_leaks", "-no_leak_scan"]
 
+    # crbug.com/413215, no heap mismatch check for Windows release build binary
+    if common.IsWindows() and "Release" in self._options.build_dir:
+        proc += ["-no_check_delete_mismatch"]
+
     # make callstacks easier to read
     proc += ["-callstack_srcfile_prefix",
              "build\\src,chromium\\src,crt_build\\self_x86"]
@@ -955,9 +959,6 @@ class DrMemory(BaseTool):
 
     proc += self._tool_flags
 
-    # DrM i#850/851: The new -callstack_use_top_fp_selectively has bugs.
-    proc += ["-no_callstack_use_top_fp_selectively"]
-
     # Dr.Memory requires -- to separate tool flags from the executable name.
     proc += ["--"]