| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from slave import recipe_api | 5 from slave import recipe_api |
| 6 from slave import recipe_util | 6 from slave import recipe_util |
| 7 | 7 |
| 8 from . import builders | 8 from . import builders |
| 9 from . import steps | 9 from . import steps |
| 10 | 10 |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 args = ['--browser=%s' % self.c.build_config_fs.lower(), | 330 args = ['--browser=%s' % self.c.build_config_fs.lower(), |
| 331 '--retry-limit=3'] | 331 '--retry-limit=3'] |
| 332 | 332 |
| 333 if not self.m.tryserver.is_tryserver: | 333 if not self.m.tryserver.is_tryserver: |
| 334 chromium_revision = self.m.bot_update.properties['got_revision'] | 334 chromium_revision = self.m.bot_update.properties['got_revision'] |
| 335 blink_revision = self.m.bot_update.properties['got_webkit_revision'] | 335 blink_revision = self.m.bot_update.properties['got_webkit_revision'] |
| 336 args += [ | 336 args += [ |
| 337 '--builder-name=%s' % self.m.properties['buildername'], | 337 '--builder-name=%s' % self.m.properties['buildername'], |
| 338 '--master-name=%s' % self.m.properties['mastername'], | 338 '--master-name=%s' % self.m.properties['mastername'], |
| 339 '--test-results-server=%s' % 'test-results.appspot.com', | 339 '--test-results-server=%s' % 'test-results.appspot.com', |
| 340 '--test-type=%s' % test_type, | |
| 341 '--metadata', 'chromium_revision=%s' % chromium_revision, | 340 '--metadata', 'chromium_revision=%s' % chromium_revision, |
| 342 '--metadata', 'blink_revision=%s' % blink_revision, | 341 '--metadata', 'blink_revision=%s' % blink_revision, |
| 343 '--metadata', 'build_number=%s' % self.m.properties['buildnumber'], | 342 '--metadata', 'build_number=%s' % self.m.properties['buildnumber'], |
| 344 ] | 343 ] |
| 345 | 344 |
| 346 args += cmd_args | 345 args += cmd_args |
| 347 | 346 |
| 348 return self.runtest( | 347 return self.runtest( |
| 349 script_path, | 348 script_path, |
| 350 args=args, | 349 args=args, |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 # Chromium workspace. | 556 # Chromium workspace. |
| 558 if self.m.platform.is_win: | 557 if self.m.platform.is_win: |
| 559 self.m.python( | 558 self.m.python( |
| 560 name='get_vs_toolchain_if_necessary', | 559 name='get_vs_toolchain_if_necessary', |
| 561 script=self.m.path['depot_tools'].join( | 560 script=self.m.path['depot_tools'].join( |
| 562 'win_toolchain', 'get_toolchain_if_necessary.py'), | 561 'win_toolchain', 'get_toolchain_if_necessary.py'), |
| 563 args=[ | 562 args=[ |
| 564 '27eac9b2869ef6c89391f305a3f01285ea317867', | 563 '27eac9b2869ef6c89391f305a3f01285ea317867', |
| 565 '9d9a93134b3eabd003b85b4e7dea06c0eae150ed', | 564 '9d9a93134b3eabd003b85b4e7dea06c0eae150ed', |
| 566 ]) | 565 ]) |
| OLD | NEW |