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 """Utility class to build the chromium master BuildFactory's. | 5 """Utility class to build the chromium master BuildFactory's. |
6 | 6 |
7 Based on gclient_factory.py and adds chromium-specific steps.""" | 7 Based on gclient_factory.py and adds chromium-specific steps.""" |
8 | 8 |
9 import re | 9 import re |
10 | 10 |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 if R('chromedriver_tests'): | 530 if R('chromedriver_tests'): |
531 f.AddGTestTestStep('chromedriver_tests', fp) | 531 f.AddGTestTestStep('chromedriver_tests', fp) |
532 if R('chromedriver_tests_br'): | 532 if R('chromedriver_tests_br'): |
533 f.AddBuildrunnerGTest('chromedriver_tests', fp) | 533 f.AddBuildrunnerGTest('chromedriver_tests', fp) |
534 if R('content_browsertests'): | 534 if R('content_browsertests'): |
535 f.AddGTestTestStep('content_browsertests', fp) | 535 f.AddGTestTestStep('content_browsertests', fp) |
536 if R('content_browsertests_br'): | 536 if R('content_browsertests_br'): |
537 f.AddBuildrunnerGTest('content_browsertests', fp) | 537 f.AddBuildrunnerGTest('content_browsertests', fp) |
538 if R('ash_browsertests'): | 538 if R('ash_browsertests'): |
539 ash_fp = fp.copy() | 539 ash_fp = fp.copy() |
540 ash_fp['browser_tests_extra_options'] = ['--ash-browsertests'] | 540 # Ash browser tests use the Metro environment and thus cannot be ran in |
| 541 # parallel on the same machine. |
| 542 ash_fp['browser_tests_extra_options'] = ['--ash-browsertests', |
| 543 '--test-launcher-jobs=1'] |
541 f.AddBuildrunnerBrowserTests(ash_fp) | 544 f.AddBuildrunnerBrowserTests(ash_fp) |
542 | 545 |
543 # Big, UI tests: | 546 # Big, UI tests: |
544 if R('dom_checker'): | 547 if R('dom_checker'): |
545 f.AddDomCheckerTests() | 548 f.AddDomCheckerTests() |
546 if R('dom_checker_br'): | 549 if R('dom_checker_br'): |
547 f.AddBuildrunnerDomCheckerTests() | 550 f.AddBuildrunnerDomCheckerTests() |
548 | 551 |
549 if self._target_platform == 'win32': | 552 if self._target_platform == 'win32': |
550 if R('installer_util_unittests'): | 553 if R('installer_util_unittests'): |
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1370 mode=None, slave_type='BuilderTester', options=None, | 1373 mode=None, slave_type='BuilderTester', options=None, |
1371 compile_timeout=1200, build_url=None, project=None, | 1374 compile_timeout=1200, build_url=None, project=None, |
1372 factory_properties=None): | 1375 factory_properties=None): |
1373 # Make sure the solution is not already there. | 1376 # Make sure the solution is not already there. |
1374 if 'cros_deps' not in [s.name for s in self._solutions]: | 1377 if 'cros_deps' not in [s.name for s in self._solutions]: |
1375 self._solutions.append(gclient_factory.GClientSolution( | 1378 self._solutions.append(gclient_factory.GClientSolution( |
1376 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) | 1379 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) |
1377 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, | 1380 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, |
1378 options, compile_timeout, build_url, project, | 1381 options, compile_timeout, build_url, project, |
1379 factory_properties) | 1382 factory_properties) |
OLD | NEW |