Propagate unknown --tool_flags to Dr. Memory as we do for Valgrind

Fix a typo in the prev patch
Increase the number of stacktrace frames to 40

TBR=bruening
Review URL: http://codereview.chromium.org/7585035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95810 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 10 deletions

diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 11ccc72c..bb5f0e98 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -712,21 +712,16 @@ class DrMemory(BaseTool):
                       help="Monitor python child processes.  If off, neither "
                       "python children nor any children of python children "
                       "will be monitored.")
-    parser._parser.add_option("", "--indirect", action="store_true",
+    parser.add_option("", "--indirect", action="store_true",
                       default=False,
                       help="set BROWSER_WRAPPER rather than "
                            "running Dr. Memory directly on the harness")
     parser.add_option("", "--use_debug", action="store_true",
                       default=False, dest="use_debug",
                       help="Run Dr. Memory debug build")
-    # TODO(bruening): I want to add --extraops that can take extra
-    # args that are passed through to Dr. Memory, but the
-    # chrome_tests.bat and chrome_tests.py layers combined w/
-    # chrome_tests.py parsing makes it not work out in practice.  We
-    # should change chrome_tests.py to pass all unknown options
-    # through to valgrind_test.py so we don't need to use --tool_flags
-    # and quote it, and ditto w/ valgrind_test.py passing unknown
-    # options through to its tool.
+    parser.add_option("", "--trace_children", action="store_true",
+                            default=True,
+                            help="TODO: default value differs from Valgrind")
 
   def ToolCommand(self):
     """Get the tool command to run."""
@@ -805,7 +800,7 @@ class DrMemory(BaseTool):
 
     # Increase some Dr. Memory constants
     proc += ["-redzone_size", "16"]
-    proc += ["-callstack_max_frames", "30"]
+    proc += ["-callstack_max_frames", "40"]
 
     # Un-comment to ignore uninitialized accesses
     #proc += ["-no_check_uninitialized"]
@@ -813,6 +808,8 @@ class DrMemory(BaseTool):
     # Un-comment to ignore leaks
     #proc += ["-no_check_leaks", "-no_count_leaks"]
 
+    proc += self._tool_flags
+
     # Dr.Memory requires -- to separate tool flags from the executable name.
     proc += ["--"]