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

Side by Side Diff: scripts/master/factory/chromium_factory.py

Issue 9197019: Add ash_shell as an alias for aura_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 os 9 import os
10 import re 10 import re
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 if R('safe_browsing'): f.AddBasicGTestTestStep( 282 if R('safe_browsing'): f.AddBasicGTestTestStep(
283 'safe_browsing_tests', fp, 283 'safe_browsing_tests', fp,
284 arg_list=['--ui-test-action-max-timeout=40000']) 284 arg_list=['--ui-test-action-max-timeout=40000'])
285 if R('sandbox'): 285 if R('sandbox'):
286 f.AddBasicGTestTestStep('sbox_unittests', fp) 286 f.AddBasicGTestTestStep('sbox_unittests', fp)
287 f.AddBasicGTestTestStep('sbox_integration_tests', fp) 287 f.AddBasicGTestTestStep('sbox_integration_tests', fp)
288 f.AddBasicGTestTestStep('sbox_validation_tests', fp) 288 f.AddBasicGTestTestStep('sbox_validation_tests', fp)
289 289
290 if R('views'): f.AddBasicGTestTestStep('views_unittests', fp) 290 if R('views'): f.AddBasicGTestTestStep('views_unittests', fp)
291 if R('aura'): f.AddBasicGTestTestStep('aura_unittests', fp) 291 if R('aura'): f.AddBasicGTestTestStep('aura_unittests', fp)
292 if R('aura_shell'): 292 if R('aura_shell') or R('ash'):
293 f.AddBasicGTestTestStep('aura_shell_unittests', fp) 293 f.AddBasicGTestTestStep('aura_shell_unittests', fp)
294 if R('compositor'): 294 if R('compositor'):
295 f.AddBasicGTestTestStep('compositor_unittests', fp) 295 f.AddBasicGTestTestStep('compositor_unittests', fp)
296 296
297 # Medium-sized tests (unit and browser): 297 # Medium-sized tests (unit and browser):
298 if R('unit'): f.AddChromeUnitTests(fp) 298 if R('unit'): f.AddChromeUnitTests(fp)
299 if R('browser_tests'): f.AddBrowserTests(fp) 299 if R('browser_tests'): f.AddBrowserTests(fp)
300 300
301 # Big, UI tests: 301 # Big, UI tests:
302 if R('ui'): f.AddUITests(fp) 302 if R('ui'): f.AddUITests(fp)
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 if 'cros_deps' not in [s.name for s in self._solutions]: 880 if 'cros_deps' not in [s.name for s in self._solutions]:
881 self._solutions.append(gclient_factory.GClientSolution( 881 self._solutions.append(gclient_factory.GClientSolution(
882 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) 882 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
883 if 'asan.DEPS' not in [s.name for s in self._solutions]: 883 if 'asan.DEPS' not in [s.name for s in self._solutions]:
884 self._solutions.append(gclient_factory.GClientSolution( 884 self._solutions.append(gclient_factory.GClientSolution(
885 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', 885 'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
886 'asan.DEPS')) 886 'asan.DEPS'))
887 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, 887 return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
888 options, compile_timeout, build_url, project, 888 options, compile_timeout, build_url, project,
889 factory_properties) 889 factory_properties)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698