Add --target flag to the chrome_tests.py scripts.

tools/heapcheck/chrome_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 heapcheck_test.py.
 
 Most of this code is copied from ../valgrind/chrome_tests.py.
 TODO(glider): put common functions to a standalone module.
 '''
@@ skipping 457 matching lines @@
   if not sys.platform.startswith('linux'):
     logging.error("Heap checking works only on Linux at the moment.")
     return 1
   parser = optparse.OptionParser("usage: %prog -b <dir> -t <test> "
                                  "[-t <test> ...]")
   parser.disable_interspersed_args()
   parser.add_option("-b", "--build-dir",
                     # TODO(thakis): Remove --build_dir once bots don't pass it.
                     "--build_dir",
                     help="the location of the output of the compiler output")
-  parser.add_option("-t", "--test", action="append",
-                    help="which test to run")
-  parser.add_option("", "--gtest_filter",
+  parser.add_option("--target", help="Debug or Release")
+  parser.add_option("-t", "--test", action="append", help="which test to run")
+  parser.add_option("--gtest_filter",
                     help="additional arguments to --gtest_filter")
-  parser.add_option("", "--gtest_repeat",
-                    help="argument for --gtest_repeat")
+  parser.add_option("--gtest_repeat", help="argument for --gtest_repeat")
   parser.add_option("-v", "--verbose", action="store_true", default=False,
                     help="verbose output - enable debug log messages")
   # My machine can do about 120 layout tests/hour in release mode.
   # Let's do 30 minutes worth per run.
   # The CPU is mostly idle, so perhaps we can raise this when
   # we figure out how to run them more efficiently.
   parser.add_option("-n", "--num_tests", default=60, type="int",
                     help="for layout tests: # of subtests per run.  0 for all.")
 
   options, args = parser.parse_args()
 
+  # target used to be a part of build_dir, so only add it if it's not there.
+  # TODO(thakis): Always do this once the memory master no longer passes
+  # the target as part of build_dir.
+  if options.target and options.target not in options.build_dir:
+    options.build_dir = os.path.join(options.build_dir, options.target)
+
   if options.verbose:
     logging_utils.config_root(logging.DEBUG)
   else:
     logging_utils.config_root()
 
   if not options.test or not len(options.test):
     parser.error("--test not specified")
 
   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())