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

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/chromium_linux.py

Issue 1679703004: Remove build-side specification of instrumentation tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 10 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 | scripts/slave/recipes/chromium.expected/chromium_linux_Android_Tests_logcat_upload_timeout.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 from . import steps 5 from . import steps
6 6
7 SPEC = { 7 SPEC = {
8 'settings': { 8 'settings': {
9 'build_gs_bucket': 'chromium-linux-archive', 9 'build_gs_bucket': 'chromium-linux-archive',
10 # WARNING: src-side runtest.py is only tested with chromium CQ builders. 10 # WARNING: src-side runtest.py is only tested with chromium CQ builders.
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 'chromium_config_kwargs': { 242 'chromium_config_kwargs': {
243 'BUILD_CONFIG': 'Debug', 243 'BUILD_CONFIG': 'Debug',
244 'TARGET_BITS': 32, 244 'TARGET_BITS': 32,
245 'TARGET_PLATFORM': 'android', 245 'TARGET_PLATFORM': 'android',
246 }, 246 },
247 'bot_type': 'tester', 247 'bot_type': 'tester',
248 'parent_buildername': 'Android Builder (dbg)', 248 'parent_buildername': 'Android Builder (dbg)',
249 'android_config': 'main_builder', 249 'android_config': 'main_builder',
250 'root_devices': True, 250 'root_devices': True,
251 'tests': [ 251 'tests': [
252 steps.AndroidInstrumentationTest('AndroidWebViewTest'),
253 steps.AndroidInstrumentationTest('ChromePublicTest'),
254 steps.AndroidInstrumentationTest('ContentShellTest'),
255 steps.AndroidInstrumentationTest('ChromeSyncShellTest'),
256 steps.AndroidJunitTest('base_junit_tests'), 252 steps.AndroidJunitTest('base_junit_tests'),
257 steps.AndroidJunitTest('chrome_junit_tests'), 253 steps.AndroidJunitTest('chrome_junit_tests'),
258 steps.AndroidJunitTest('components_junit_tests'), 254 steps.AndroidJunitTest('components_junit_tests'),
259 steps.AndroidJunitTest('content_junit_tests'), 255 steps.AndroidJunitTest('content_junit_tests'),
260 steps.AndroidJunitTest('junit_unit_tests'), 256 steps.AndroidJunitTest('junit_unit_tests'),
261 steps.AndroidJunitTest('net_junit_tests'), 257 steps.AndroidJunitTest('net_junit_tests'),
262 ], 258 ],
263 'test_generators': [ 259 'test_generators': [
264 steps.generate_gtest, 260 steps.generate_gtest,
265 steps.generate_script, 261 steps.generate_script,
266 steps.generate_isolated_script, 262 steps.generate_isolated_script,
bpastene 2016/02/08 18:00:37 Add the new generator here: steps.generate_instrum
ghost stip (do not use) 2016/02/08 19:25:26 Done.
267 ], 263 ],
268 'testing': { 264 'testing': {
269 'platform': 'linux', 265 'platform': 'linux',
270 }, 266 },
271 'enable_swarming': True, 267 'enable_swarming': True,
272 }, 268 },
273 269
274 'Android Builder': { 270 'Android Builder': {
275 'chromium_config': 'android', 271 'chromium_config': 'android',
276 'gclient_config': 'chromium', 272 'gclient_config': 'chromium',
(...skipping 21 matching lines...) Expand all
298 'chromium_config_kwargs': { 294 'chromium_config_kwargs': {
299 'BUILD_CONFIG': 'Release', 295 'BUILD_CONFIG': 'Release',
300 'TARGET_BITS': 32, 296 'TARGET_BITS': 32,
301 'TARGET_PLATFORM': 'android', 297 'TARGET_PLATFORM': 'android',
302 }, 298 },
303 'bot_type': 'tester', 299 'bot_type': 'tester',
304 'parent_buildername': 'Android Builder', 300 'parent_buildername': 'Android Builder',
305 'android_config': 'main_builder', 301 'android_config': 'main_builder',
306 'root_devices': True, 302 'root_devices': True,
307 'tests': [ 303 'tests': [
308 steps.AndroidInstrumentationTest('AndroidWebViewTest'),
309 steps.AndroidInstrumentationTest('ChromePublicTest'),
310 steps.AndroidInstrumentationTest('ContentShellTest'),
311 steps.AndroidInstrumentationTest('ChromeSyncShellTest'),
312 steps.AndroidJunitTest('base_junit_tests'), 304 steps.AndroidJunitTest('base_junit_tests'),
313 steps.AndroidJunitTest('chrome_junit_tests'), 305 steps.AndroidJunitTest('chrome_junit_tests'),
314 steps.AndroidJunitTest('components_junit_tests'), 306 steps.AndroidJunitTest('components_junit_tests'),
315 steps.AndroidJunitTest('content_junit_tests'), 307 steps.AndroidJunitTest('content_junit_tests'),
316 steps.AndroidJunitTest('junit_unit_tests'), 308 steps.AndroidJunitTest('junit_unit_tests'),
317 steps.AndroidJunitTest('net_junit_tests'), 309 steps.AndroidJunitTest('net_junit_tests'),
318 ], 310 ],
319 'test_generators': [ 311 'test_generators': [
320 steps.generate_gtest, 312 steps.generate_gtest,
321 steps.generate_script, 313 steps.generate_script,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 'TARGET_BITS': 32, 373 'TARGET_BITS': 32,
382 'TARGET_PLATFORM': 'android', 374 'TARGET_PLATFORM': 'android',
383 }, 375 },
384 'android_config': 'cast_builder', 376 'android_config': 'cast_builder',
385 'testing': { 377 'testing': {
386 'platform': 'linux', 378 'platform': 'linux',
387 }, 379 },
388 }, 380 },
389 }, 381 },
390 } 382 }
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.expected/chromium_linux_Android_Tests_logcat_upload_timeout.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698