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

tools/valgrind/valgrind_test.py

 #!/usr/bin/python
 # 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.
 
 # valgrind_test.py
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
@@ skipping 694 matching lines @@
 
   def ExtendOptionParser(self, parser):
     parser.add_option("", "--suppressions", default=[],
                       action="append",
                       help="path to a drmemory suppression file")
     parser.add_option("", "--follow_python", action="store_true",
                       default=False, dest="follow_python",
                       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",

[Timur Iskhodzhanov, 2011/08/08 13:38:04]

oops - this was copy-paste mistake

+    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

[Timur Iskhodzhanov, 2011/08/08 13:38:04]

This is what --tool_flags was made for.
I've just forgotten to propagate it in the Dr. Memory runner

-    # 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

[Timur Iskhodzhanov, 2011/08/08 13:38:04]

re: to use --tool_flags or not to use
If one makes a typo in some chrome_tests flag (e.g. --t0ol), the suggested
approach would propagate --t0ol to the tool and it would fail on load. This is
not very debuggable when you start up a large test like ui_tests with
BROWSER_WRAPPER where you don't see the tool output at all...
We've had this --tool_flags for 2+ years for Valgrind-based tools and looks like
only Chrome-Valgrind team ever needed it :)

You can re-formulate and put back the TODO if you still think we should do w/o
--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."""
     tool_name = self.ToolName()
 
     # WINHEAP is what Dr. Memory supports as there are issues w/ both
     # jemalloc (http://code.google.com/p/drmemory/issues/detail?id=320) and
     # tcmalloc (http://code.google.com/p/drmemory/issues/detail?id=314)
     add_env = {
       "CHROME_ALLOCATOR" : "WINHEAP",
@@ skipping 58 matching lines @@
     #proc += ["-dr_ops", "-no_hide -msgbox_mask 15"]
 
     if self._options.use_debug:
       proc += ["-debug"]
 
     proc += ["-logdir", self.log_dir]
     proc += ["-batch", "-quiet"]
 
     # 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"]
 
     # 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 += ["--"]
 
     if self._options.indirect:
       self.CreateBrowserWrapper(" ".join(proc))
       proc = []
 
     # Note that self._args begins with the name of the exe to be run.
     proc += self._args
     return proc
@@ skipping 156 matching lines @@
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)
 
 if __name__ == '__main__':
   logging.error(sys.argv[0] + " can not be run from command line")
   sys.exit(1)