Move memory waterfall build directory computation to the slave.

scripts/slave/runtest.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.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 630 matching lines @@
 
   if options.parallel:
     command = _BuildParallelCommand(build_dir, test_exe_path, options)
   elif options.run_shell_script:
     command = ['bash', test_exe_path]
   elif options.run_python_script:
     command = [sys.executable, test_exe]
   else:
     command = [test_exe_path]
   command.extend(args[1:])
+  if options.pass_build_dir:
+    command.append('--build-dir=' + build_dir)

[M-A Ruel, 2013/10/06 20:32:26]

In general I prefer using 2 separate arguments, e.g.
command.extend(('--build-dir', build_dir))
because it'll break on Windows if the string ever get escaped.

There's plenty of other places here that do this so I don't mind, just FYI.

 
   if list_parsers(options.annotate):
     return 0
   tracker_class = select_results_tracker(options.annotate,
                                          options.generate_json_file)
   results_tracker = create_results_tracker(tracker_class, options)
 
   if options.generate_json_file:
     if os.path.exists(options.test_output_xml):
       # remove the old XML output file.
@@ skipping 71 matching lines @@
     # If first argument is not in the correct format, log a warning but
     # fall back to assuming the first arg is the test_name and just run
     # on the iphone simulator.
     test_name = args[0]
     print ('Can\'t parse test name, device, and iOS version. '
            'Running %s on %s %s' % (test_name, device, ios_version))
 
   # Build the args for invoking iossim, which will install the app on the
   # simulator and launch it, then dump the test results to stdout.
 
-  # Note that the first object (build_dir) returned from the following
-  # method invocations is ignored because only the app executable is needed.
-  _, app_exe_path = get_build_dir_and_exe_path_mac(
+  build_dir, app_exe_path = get_build_dir_and_exe_path_mac(
       options,
       options.target + '-iphonesimulator',
       test_name + '.app')
 
+  # Note that the first object (build_dir) returned from the following
+  # method invocations is ignored because only the app executable is needed.
   _, test_exe_path = get_build_dir_and_exe_path_mac(options,
       os.path.join('ninja-iossim', options.target),
       'iossim')
   command = [test_exe_path,
       '-d', device,
       '-s', ios_version,
       app_exe_path, '--'
   ]
   command.extend(args[1:])
+  if options.pass_build_dir:
+    command.append('--build-dir=' + build_dir)
 
   if list_parsers(options.annotate):
     return 0
   results_tracker = create_results_tracker(get_parsers()['gtest'], options)
 
   # Make sure the simulator isn't running.
   kill_simulator()
 
   # Nuke anything that appears to be stale chrome items in the temporary
   # directory from previous test runs (i.e.- from crashes or unittest leaks).
@@ skipping 120 matching lines @@
 
   if options.parallel:
     command = _BuildParallelCommand(build_dir, test_exe_path, options)
   elif options.run_shell_script:
     command = ['bash', test_exe_path]
   elif options.run_python_script:
     command = [sys.executable, test_exe]
   else:
     command = [test_exe_path]
   command.extend(args[1:])
+  if options.pass_build_dir:
+    command.append('--build-dir=' + build_dir)
 
   if list_parsers(options.annotate):
     return 0
   tracker_class = select_results_tracker(options.annotate,
                                          options.generate_json_file)
   results_tracker = create_results_tracker(tracker_class, options)
 
   if options.generate_json_file:
     if os.path.exists(options.test_output_xml):
       # remove the old XML output file.
@@ skipping 98 matching lines @@
   # build_dir/target/ directory.
   if options.factory_properties.get('asan'):
     logfile = test_exe_path + '.asan_log'
     command = ['%s' % os.path.join(build_dir,
                                    options.target,
                                    'agent_logger.exe'),
                'start',
                '--output-file=%s' % logfile,
                '--'] + command
   command.extend(args[1:])
+  if options.pass_build_dir:
+    command.append('--build-dir=' + build_dir)
 
   # Nuke anything that appears to be stale chrome items in the temporary
   # directory from previous test runs (i.e.- from crashes or unittest leaks).
   slave_utils.RemoveChromeTemporaryFiles()
 
   if list_parsers(options.annotate):
     return 0
   tracker_class = select_results_tracker(options.annotate,
                                          options.generate_json_file)
   results_tracker = create_results_tracker(tracker_class, options)
@@ skipping 106 matching lines @@
                       datefmt='%y%m%d %H:%M:%S')
 
   option_parser = optparse.OptionParser(usage=USAGE)
 
   # Since the trailing program to run may have has command-line args of its
   # own, we need to stop parsing when we reach the first positional argument.
   option_parser.disable_interspersed_args()
 
   option_parser.add_option('', '--target', default='Release',
                            help='build target (Debug or Release)')
+  option_parser.add_option('--pass-target', action='store_true', default=False,
+                           help='pass --target to the spawned test script')
   option_parser.add_option('', '--build-dir',
                            help='path to main build directory (the parent of '
                                 'the Release or Debug directory)')
+  option_parser.add_option('--pass-build-dir', action='store_true',
+                           default=False,
+                           help='pass --build-dir to the spawned test script')
   option_parser.add_option('', '--enable-pageheap', action='store_true',
                            default=False,
                            help='enable pageheap checking for chrome.exe')
   # --with-httpd assumes a chromium checkout with src/tools/python.
   option_parser.add_option('', '--with-httpd', dest='document_root',
                            default=None, metavar='DOC_ROOT',
                            help='Start a local httpd server using the given '
                                 'document root, relative to the current dir')
   option_parser.add_option('', '--total-shards', dest='total_shards',
                            default=None, type='int',
@@ skipping 98 matching lines @@
       'step_name', '')
 
   if options.run_shell_script and options.run_python_script:
     sys.stderr.write('Use either --run-shell-script OR --run-python-script, '
                      'not both.')
     return 1
 
   # Print out builder name for log_parser
   print '[Running on builder: "%s"]' % options.builder_name
 
+  if options.pass_target and options.target:
+    args.append('--target=' + options.target)
+  # TODO(thakis): Unify build_dir logic and handle pass_build_dir here too.
+
   # Some test suites are not yet green under LSan, so do not enable LSan for
   # them by default. Bots can override this behavior with lsan_run_all_tests.
   lsan_blacklist = [
       'browser_tests',
       'content_browsertests',
       'interactive_ui_tests',
   ]
   options.enable_lsan = (options.enable_lsan or
      (options.factory_properties.get('lsan', False) and
       (options.factory_properties.get('lsan_run_all_tests', False) or
@@ skipping 115 matching lines @@
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())