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

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

Issue 28933002: Android: do not run telemetry directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 2 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
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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 f.AddBuildrunnerWebkitPythonTests(factory_properties=fp) 575 f.AddBuildrunnerWebkitPythonTests(factory_properties=fp)
576 if R('webkit'): 576 if R('webkit'):
577 f.AddWebkitTests(factory_properties=fp) 577 f.AddWebkitTests(factory_properties=fp)
578 if R('devtools_perf'): 578 if R('devtools_perf'):
579 f.AddDevToolsTests(factory_properties=fp) 579 f.AddDevToolsTests(factory_properties=fp)
580 580
581 # Android device test 581 # Android device test
582 if R('device_status'): 582 if R('device_status'):
583 f.AddDeviceStatus(factory_properties=fp) 583 f.AddDeviceStatus(factory_properties=fp)
584 584
585 if fp.get('android_sharded_perf_tests'):
586 f.AddAndroidShardedPerfTests(factory_properties=fp)
587
585 def Telemetry(test_name): 588 def Telemetry(test_name):
586 if R(test_name.replace('.', '_')): 589 if R(test_name.replace('.', '_')):
587 f.AddTelemetryTest(test_name, factory_properties=fp) 590 f.AddTelemetryTest(test_name, factory_properties=fp)
588 591
589 # Benchmark tests: 592 # Benchmark tests:
590 # Page cyclers: 593 # Page cyclers:
591 page_cyclers = ( 594 page_cyclers = (
592 'bloat', 595 'bloat',
593 'dhtml', 596 'dhtml',
594 'indexeddb', 597 'indexeddb',
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 mode=None, slave_type='BuilderTester', options=None, 1415 mode=None, slave_type='BuilderTester', options=None,
1413 compile_timeout=1200, build_url=None, project=None, 1416 compile_timeout=1200, build_url=None, project=None,
1414 factory_properties=None): 1417 factory_properties=None):
1415 # Make sure the solution is not already there. 1418 # Make sure the solution is not already there.
1416 if 'cros_deps' not in [s.name for s in self._solutions]: 1419 if 'cros_deps' not in [s.name for s in self._solutions]:
1417 self._solutions.append(gclient_factory.GClientSolution( 1420 self._solutions.append(gclient_factory.GClientSolution(
1418 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps')) 1421 config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
1419 return self.ChromiumFactory(target, clobber, tests, mode, slave_type, 1422 return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
1420 options, compile_timeout, build_url, project, 1423 options, compile_timeout, build_url, project,
1421 factory_properties) 1424 factory_properties)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698