Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Set of utilities to add commands to a buildbot factory. | 5 """Set of utilities to add commands to a buildbot factory. |
| 6 | 6 |
| 7 This is based on commands.py and adds chromium-specific commands.""" | 7 This is based on commands.py and adds chromium-specific commands.""" |
| 8 | 8 |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 self._check_licenses_tool = J('src', 'tools', 'checklicenses', | 91 self._check_licenses_tool = J('src', 'tools', 'checklicenses', |
| 92 'checklicenses.py') | 92 'checklicenses.py') |
| 93 self._posix_memory_tests_runner = J('src', 'tools', 'valgrind', | 93 self._posix_memory_tests_runner = J('src', 'tools', 'valgrind', |
| 94 'chrome_tests.sh') | 94 'chrome_tests.sh') |
| 95 self._win_memory_tests_runner = J('src', 'tools', 'valgrind', | 95 self._win_memory_tests_runner = J('src', 'tools', 'valgrind', |
| 96 'chrome_tests.bat') | 96 'chrome_tests.bat') |
| 97 self._heapcheck_tool = J('src', 'tools', 'heapcheck', 'chrome_tests.sh') | 97 self._heapcheck_tool = J('src', 'tools', 'heapcheck', 'chrome_tests.sh') |
| 98 self._nacl_integration_tester_tool = J( | 98 self._nacl_integration_tester_tool = J( |
| 99 'src', 'chrome', 'test', 'nacl_test_injection', | 99 'src', 'chrome', 'test', 'nacl_test_injection', |
| 100 'buildbot_nacl_integration.py') | 100 'buildbot_nacl_integration.py') |
| 101 self._mini_installer_tests_runner = J('src', 'chrome', 'test', | |
| 102 'mini_installer', 'test_installer.py') | |
| 103 self._mini_installer_tests = J('src', 'chrome', 'test', 'mini_installer', | |
| 104 'config', 'config.config') | |
| 101 # chrome_staging directory, relative to the build directory. | 105 # chrome_staging directory, relative to the build directory. |
| 102 self._staging_dir = self.PathJoin('..', 'chrome_staging') | 106 self._staging_dir = self.PathJoin('..', 'chrome_staging') |
| 103 | 107 |
| 104 # The _update_scripts_command will be run in the _update_scripts_dir to | 108 # The _update_scripts_command will be run in the _update_scripts_dir to |
| 105 # udpate the slave's own script checkout. | 109 # udpate the slave's own script checkout. |
| 106 self._update_scripts_dir = '..' | 110 self._update_scripts_dir = '..' |
| 107 self._update_scripts_command = [ | 111 self._update_scripts_command = [ |
| 108 chromium_utils.GetGClientCommand(self._target_platform), | 112 chromium_utils.GetGClientCommand(self._target_platform), |
| 109 'sync', '--verbose'] | 113 'sync', '--verbose'] |
| 110 | 114 |
| (...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1588 | 1592 |
| 1589 def AddWebRtcPerfManualBrowserTests(self, factory_properties=None): | 1593 def AddWebRtcPerfManualBrowserTests(self, factory_properties=None): |
| 1590 cmd_options = ['--run-manual', '--ui-test-action-max-timeout=300000'] | 1594 cmd_options = ['--run-manual', '--ui-test-action-max-timeout=300000'] |
| 1591 self.AddAnnotatedPerfStep(test_name='webrtc_manual_browser_tests', | 1595 self.AddAnnotatedPerfStep(test_name='webrtc_manual_browser_tests', |
| 1592 gtest_filter="Webrtc*", | 1596 gtest_filter="Webrtc*", |
| 1593 log_type='graphing', | 1597 log_type='graphing', |
| 1594 factory_properties=factory_properties, | 1598 factory_properties=factory_properties, |
| 1595 cmd_name='browser_tests', | 1599 cmd_name='browser_tests', |
| 1596 cmd_options=cmd_options) | 1600 cmd_options=cmd_options) |
| 1597 | 1601 |
| 1602 def AddMiniInstallerTestStep(self, factory_properties): | |
| 1603 if self._target_platform == 'win32' and self._target == 'Release': | |
|
csharp
2013/08/28 19:25:00
Why this if statement? Does this test not sense in
sukolsak
2013/08/28 19:46:19
Fixed. This should also work with 64-bit builds. I
| |
| 1604 cmd = [self._python, self._mini_installer_tests_runner, | |
| 1605 self._mini_installer_tests] | |
| 1606 self.AddTestStep(chromium_step.AnnotatedCommand, 'test_mini_installer', | |
| 1607 cmd, halt_on_failure=True, timeout=600, | |
| 1608 do_step_if=self.TestStepFilter) | |
| 1609 | |
| 1598 def AddChromebotServer(self, factory_properties=None): | 1610 def AddChromebotServer(self, factory_properties=None): |
| 1599 """Add steps to run Chromebot script for server. | 1611 """Add steps to run Chromebot script for server. |
| 1600 | 1612 |
| 1601 This expects build property to be set with Chromium build number, which | 1613 This expects build property to be set with Chromium build number, which |
| 1602 is set by SetBuildPropertyShellCommand in GetBuildForChromebot step. | 1614 is set by SetBuildPropertyShellCommand in GetBuildForChromebot step. |
| 1603 | 1615 |
| 1604 Args: | 1616 Args: |
| 1605 client_os: Target client OS (win or linux). | 1617 client_os: Target client OS (win or linux). |
| 1606 server_port: Port for client/server communication. | 1618 server_port: Port for client/server communication. |
| 1607 timeout: Max time (secs) to run Chromebot server script. | 1619 timeout: Max time (secs) to run Chromebot server script. |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1809 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name) | 1821 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name) |
| 1810 | 1822 |
| 1811 | 1823 |
| 1812 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'): | 1824 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'): |
| 1813 if not factory_properties or 'gs_bucket' not in factory_properties: | 1825 if not factory_properties or 'gs_bucket' not in factory_properties: |
| 1814 return (_GetArchiveUrl('snapshots', builder_name), None) | 1826 return (_GetArchiveUrl('snapshots', builder_name), None) |
| 1815 gs_bucket = factory_properties['gs_bucket'] | 1827 gs_bucket = factory_properties['gs_bucket'] |
| 1816 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/', | 1828 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/', |
| 1817 gs_bucket) | 1829 gs_bucket) |
| 1818 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/') | 1830 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/') |
| OLD | NEW |