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

tools/heapcheck/chrome_tests.py

Index: tools/heapcheck/chrome_tests.py
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index c96adc9bd7408bfdcdfb69255ceb5411448249cb..cfc662a11cad1e3259563b79e6c3fb538ea3f07f 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -475,12 +475,11 @@ def main():
                     # 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.
@@ -492,6 +491,12 @@ def main():
 
   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: