Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(973)

Unified Diff: scripts/master/factory/chromium_commands.py

Issue 26184003: Move memory waterfall build directory computation to the slave. (Closed) Base URL: http://src.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/runtest.py » ('j') | scripts/slave/runtest.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/master/factory/chromium_commands.py
===================================================================
--- scripts/master/factory/chromium_commands.py (revision 227231)
+++ scripts/master/factory/chromium_commands.py (working copy)
@@ -779,14 +779,12 @@
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:
@@ -806,14 +804,13 @@
# 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')],
@@ -835,13 +832,11 @@
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()]
@@ -853,7 +848,6 @@
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)
« no previous file with comments | « no previous file | scripts/slave/runtest.py » ('j') | scripts/slave/runtest.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698