Move memory waterfall build directory computation to the slave.

scripts/slave/runtest.py

Index: scripts/slave/runtest.py
===================================================================
--- scripts/slave/runtest.py	(revision 227231)
+++ scripts/slave/runtest.py	(working copy)
@@ -648,6 +648,8 @@
   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
@@ -739,13 +741,13 @@
   # 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')
@@ -755,6 +757,8 @@
       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
@@ -895,6 +899,8 @@
   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
@@ -1013,6 +1019,8 @@
                '--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).
@@ -1139,9 +1147,14 @@
 
   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')
@@ -1260,6 +1273,10 @@
   # 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 = [