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

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, 11 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 if R('safe_browsing'): f.AddBasicGTestTestStep( 281 if R('safe_browsing'): f.AddBasicGTestTestStep(
282 'safe_browsing_tests', fp, 282 'safe_browsing_tests', fp,
283 arg_list=['--ui-test-action-max-timeout=40000']) 283 arg_list=['--ui-test-action-max-timeout=40000'])
284 if R('sandbox'): 284 if R('sandbox'):
285 f.AddBasicGTestTestStep('sbox_unittests', fp) 285 f.AddBasicGTestTestStep('sbox_unittests', fp)
286 f.AddBasicGTestTestStep('sbox_integration_tests', fp) 286 f.AddBasicGTestTestStep('sbox_integration_tests', fp)
287 f.AddBasicGTestTestStep('sbox_validation_tests', fp) 287 f.AddBasicGTestTestStep('sbox_validation_tests', fp)
288 288
289 if R('views'): f.AddBasicGTestTestStep('views_unittests', fp) 289 if R('views'): f.AddBasicGTestTestStep('views_unittests', fp)
290 if R('aura'): f.AddBasicGTestTestStep('aura_unittests', fp) 290 if R('aura'): f.AddBasicGTestTestStep('aura_unittests', fp)
291 if R('aura_shell'): 291 if R('aura_shell') or R('ash_shell'):
James Cook 2012/01/13 00:39:13 I think 'ash_shell' should just be 'ash'. The cod
Peter Mayo 2012/01/16 16:48:07 Done.
292 f.AddBasicGTestTestStep('aura_shell_unittests', fp) 292 f.AddBasicGTestTestStep('aura_shell_unittests', fp)
293 if R('compositor'): 293 if R('compositor'):
294 f.AddBasicGTestTestStep('compositor_unittests', fp) 294 f.AddBasicGTestTestStep('compositor_unittests', fp)
295 295
296 # Medium-sized tests (unit and browser): 296 # Medium-sized tests (unit and browser):
297 if R('unit'): f.AddChromeUnitTests(fp) 297 if R('unit'): f.AddChromeUnitTests(fp)
298 if R('browser_tests'): f.AddBrowserTests(fp) 298 if R('browser_tests'): f.AddBrowserTests(fp)
299 299
300 # Big, UI tests: 300 # Big, UI tests:
301 if R('ui'): f.AddUITests(fp) 301 if R('ui'): f.AddUITests(fp)
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 if 'cros_deps' not in [s.name for s in self._solutions]: 841 if 'cros_deps' not in [s.name for s in self._solutions]:
842 self._solutions.append(gclient_factory.GClientSolution( 842 self._solutions.append(gclient_factory.GClientSolution(
843 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) 843 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
844 if 'asan.DEPS' not in [s.name for s in self._solutions]: 844 if 'asan.DEPS' not in [s.name for s in self._solutions]:
845 self._solutions.append(gclient_factory.GClientSolution( 845 self._solutions.append(gclient_factory.GClientSolution(
846 'http://src.chromium.org/svn/trunk/deps/asan.DEPS', 846 'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
847 'asan.DEPS')) 847 'asan.DEPS'))
848 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, 848 return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
849 options, compile_timeout, build_url, project, 849 options, compile_timeout, build_url, project,
850 factory_properties) 850 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