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

Side by Side Diff: scripts/slave/recipe_modules/chromium/chromium_fyi.py

Issue 1166373003: Let CrWinClang64(dbg) use gn. (Closed) Base URL: http://src.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 5 years, 6 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
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 RESULTS_URL = 'https://chromeperf.appspot.com' 7 RESULTS_URL = 'https://chromeperf.appspot.com'
8 8
9 SPEC = { 9 SPEC = {
10 'settings': { 10 'settings': {
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 ], 535 ],
536 'bot_type': 'tester', 536 'bot_type': 'tester',
537 'parent_buildername': 'CrWinClang64', 537 'parent_buildername': 'CrWinClang64',
538 'testing': { 538 'testing': {
539 'platform': 'win', 539 'platform': 'win',
540 }, 540 },
541 'enable_swarming': True, 541 'enable_swarming': True,
542 }, 542 },
543 'CrWinClang64(dbg)': { 543 'CrWinClang64(dbg)': {
544 'chromium_config': 'chromium_win_clang', 544 'chromium_config': 'chromium_win_clang',
545 'chromium_apply_config': ['mb'],
545 'gclient_config': 'chromium', 546 'gclient_config': 'chromium',
546 'chromium_config_kwargs': { 547 'chromium_config_kwargs': {
547 'BUILD_CONFIG': 'Debug', 548 'BUILD_CONFIG': 'Debug',
548 'TARGET_BITS': 64, 549 'TARGET_BITS': 64,
549 }, 550 },
550 # Recipes builds Debug builds with component=shared_library by default. 551 # Recipes builds Debug builds with component=shared_library by default.
551 'bot_type': 'builder', 552 'bot_type': 'builder',
552 'testing': { 553 'testing': {
553 'platform': 'win', 554 'platform': 'win',
554 }, 555 },
555 'use_isolate': True, 556 # TODO(thakis): Reenable when swarming works in gn http://crbug.com/480053
556 'enable_swarming': True, 557 #'use_isolate': True,
558 #'enable_swarming': True,
Nico 2015/06/09 05:09:36 I guess I didn't have to change the json file in h
Dirk Pranke 2015/06/09 15:50:01 Yeah, but probably better to be clearer anyway.
557 # Workaround so that recipes doesn't add random build targets to our 559 # Workaround so that recipes doesn't add random build targets to our
558 # compile line. We want to build everything. 560 # compile line. We want to build everything.
559 'add_tests_as_compile_targets': False, 561 'add_tests_as_compile_targets': False,
560 }, 562 },
561 'CrWinClang64(dbg) tester': { 563 'CrWinClang64(dbg) tester': {
562 'chromium_config': 'chromium_no_goma', 564 'chromium_config': 'chromium_no_goma',
563 'gclient_config': 'chromium', 565 'gclient_config': 'chromium',
564 'chromium_config_kwargs': { 566 'chromium_config_kwargs': {
565 'BUILD_CONFIG': 'Debug', 567 'BUILD_CONFIG': 'Debug',
566 'TARGET_BITS': 64, 568 'TARGET_BITS': 64,
567 }, 569 },
568 'test_generators': [ 570 'test_generators': [
569 steps.generate_gtest, 571 steps.generate_gtest,
570 ], 572 ],
571 'bot_type': 'tester', 573 'bot_type': 'tester',
572 'parent_buildername': 'CrWinClang64(dbg)', 574 'parent_buildername': 'CrWinClang64(dbg)',
573 'testing': { 575 'testing': {
574 'platform': 'win', 576 'platform': 'win',
575 }, 577 },
576 'enable_swarming': True, 578 # TODO(thakis): Reenable when swarming works in gn http://crbug.com/480053
579 #'enable_swarming': True,
577 }, 580 },
578 'CrWinClang64(dll)': { 581 'CrWinClang64(dll)': {
579 'chromium_config': 'chromium_win_clang', 582 'chromium_config': 'chromium_win_clang',
580 'gclient_config': 'chromium', 583 'gclient_config': 'chromium',
581 'chromium_config_kwargs': { 584 'chromium_config_kwargs': {
582 'BUILD_CONFIG': 'Release', 585 'BUILD_CONFIG': 'Release',
583 'TARGET_BITS': 64, 586 'TARGET_BITS': 64,
584 }, 587 },
585 'GYP_DEFINES': { 'component': 'shared_library' }, 588 'GYP_DEFINES': { 'component': 'shared_library' },
586 'bot_type': 'builder', 589 'bot_type': 'builder',
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 'ChromotingTest', 'remoting_test_apk', 1485 'ChromotingTest', 'remoting_test_apk',
1483 adb_install_apk=( 1486 adb_install_apk=(
1484 'Chromoting.apk', 'org.chromium.chromoting')), 1487 'Chromoting.apk', 'org.chromium.chromoting')),
1485 ], 1488 ],
1486 'testing': { 1489 'testing': {
1487 'platform': 'linux', 1490 'platform': 'linux',
1488 }, 1491 },
1489 }, 1492 },
1490 }, 1493 },
1491 } 1494 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698