Move memory waterfall build directory computation to the slave.

scripts/master/factory/chromium_commands.py

 # 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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds chromium-specific commands."""
 
 import logging
 import os
@@ skipping 761 matching lines @@
   def AddMemoryTest(self, test_name, tool_name, timeout=1200,
                     factory_properties=None,
                     wrapper_args=None):
     factory_properties = factory_properties or {}
     factory_properties['full_test_name'] = True
     if not wrapper_args:
       wrapper_args = []
     wrapper_args.extend([
         '--annotate=gtest',
         '--test-type', 'memory test: %s' % test_name
+        '--pass-build-dir',
+        '--pass-target',
     ])
     command_class = chromium_step.AnnotatedCommand
 
     # TODO(timurrrr): merge this with Heapcheck runner. http://crbug.com/45482
-    build_dir, _ = chromium_utils.ConvertBuildDirToLegacy(self._build_dir,
-                                                          self._target_platform)
-    build_dir = os.path.join(build_dir, self._target)
-
     do_step_if = self.TestStepFilter
     matched = re.search(r'_([0-9]*)_of_([0-9]*)$', test_name)
     if matched:
       test_name = test_name[0:matched.start()]
       shard = int(matched.group(1))
       numshards = int(matched.group(2))
       wrapper_args.extend(['--shard-index', str(shard),
                            '--total-shards', str(numshards)])
       if test_name in factory_properties.get('sharded_tests', []):
         wrapper_args.append('--parallel')
         sharding_args = factory_properties.get('sharding_args')
         if sharding_args:
           wrapper_args.extend(['--sharding-args', sharding_args])
     elif test_name.endswith('_gtest_filter_required'):
       test_name = test_name[0:-len('_gtest_filter_required')]
       # This is only to be run on the Try Server.
       # TODO(maruel): This code should use GetTestStepFilter() instead!
       do_step_if = self.TestStepFilterGTestFilterRequired
 
-    # Memory tests runner script path is relative to build_dir.
+    # Memory tests runner script path is relative to build dir.
     if self._target_platform != 'win32':
       runner = os.path.join('..', '..', '..', self._posix_memory_tests_runner)
     else:
       runner = os.path.join('..', '..', '..', self._win_memory_tests_runner)
 
     cmd = self.GetShellTestCommand(runner, arg_list=[
-        '--build_dir', build_dir,
         '--test', test_name,
         '--tool', tool_name,
         WithProperties('%(gtest_filter)s')],
         wrapper_args=wrapper_args,
         factory_properties=factory_properties)
 
     test_name = 'memory test: %s' % test_name
     self.AddTestStep(command_class, test_name, cmd,
                      timeout=timeout,
                      do_step_if=do_step_if)
 
   def AddHeapcheckTest(self, test_name, timeout, factory_properties,
                        wrapper_args=None):
 
     factory_properties = factory_properties or {}
     factory_properties['full_test_name'] = True
     if not wrapper_args:
       wrapper_args = []
     wrapper_args.extend([
         '--annotate=gtest',
         '--test-type', 'heapcheck test: %s' % test_name
+        '--pass-build-dir',
+        '--pass-target',
     ])
     command_class = chromium_step.AnnotatedCommand
 
-    build_dir, _ = chromium_utils.ConvertBuildDirToLegacy(self._build_dir,
-                                                          self._target_platform)
-    build_dir = os.path.join(build_dir, self._target)
-
     matched = re.search(r'_([0-9]*)_of_([0-9]*)$', test_name)
     if matched:
       test_name = test_name[0:matched.start()]
       shard = int(matched.group(1))
       numshards = int(matched.group(2))
       wrapper_args.extend(['--shard-index', str(shard),
                            '--total-shards', str(numshards)])
 
     heapcheck_tool = os.path.join('..', '..', '..', self._heapcheck_tool)
 
     cmd = self.GetShellTestCommand(heapcheck_tool, arg_list=[
-        '--build_dir', build_dir,
         '--test', test_name],
         wrapper_args=wrapper_args,
         factory_properties=factory_properties)
 
     test_name = 'heapcheck test: %s' % test_name
     self.AddTestStep(command_class, test_name, cmd,
                      timeout=timeout,
                      do_step_if=self.TestStepFilter)
 
   def _AddBasicPythonTest(self, test_name, script, args=None, timeout=1200):
@@ skipping 965 matching lines @@
   return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name)
 
 
 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'):
   if not factory_properties or 'gs_bucket' not in factory_properties:
     return (_GetArchiveUrl('snapshots', builder_name), None)
   gs_bucket = factory_properties['gs_bucket']
   gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/',
                      gs_bucket)
   return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/')