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

Side by Side Diff: masters/master.tryserver.chromium/master.cfg

Issue 25792002: Turn off ash and aura by default on linux blink bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge to r226807 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 # -*- python -*- 1 # -*- python -*-
2 # ex: set syntax=python: 2 # ex: set syntax=python:
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # READ THIS: 7 # READ THIS:
8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure 8 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
9 9
10 import socket 10 import socket
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1369 'slavebuilddir': 'linux_layout', 1369 'slavebuilddir': 'linux_layout',
1370 'factory': m_chromium_linux.ChromiumFactory( 1370 'factory': m_chromium_linux.ChromiumFactory(
1371 slave_type='Trybot', 1371 slave_type='Trybot',
1372 target='Release', 1372 target='Release',
1373 tests=blink_tests, 1373 tests=blink_tests,
1374 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'], 1374 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'],
1375 factory_properties={ 1375 factory_properties={
1376 'archive_webkit_results': ActiveMaster.is_production_host, 1376 'archive_webkit_results': ActiveMaster.is_production_host,
1377 'blink_config': 'blink', 1377 'blink_config': 'blink',
1378 'gclient_env': { 1378 'gclient_env': {
1379 'GYP_DEFINES': 'use_ash=0 use_aura=0',
1379 'GYP_GENERATORS': 'ninja', 1380 'GYP_GENERATORS': 'ninja',
1380 }, 1381 },
1381 }), 1382 }),
1382 } 1383 }
1383 1384
1384 b_linux_layout_rel_32 = { 1385 b_linux_layout_rel_32 = {
1385 'name': 'linux_layout_rel_32', 1386 'name': 'linux_layout_rel_32',
1386 # Reuse the directory. 1387 # Reuse the directory.
1387 'slavebuilddir': 'linux_layout', 1388 'slavebuilddir': 'linux_layout',
1388 'factory': m_chromium_linux.ChromiumFactory( 1389 'factory': m_chromium_linux.ChromiumFactory(
1389 slave_type='Trybot', 1390 slave_type='Trybot',
1390 target='Release', 1391 target='Release',
1391 tests=blink_tests, 1392 tests=blink_tests,
1392 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'], 1393 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'],
1393 factory_properties={ 1394 factory_properties={
1394 'archive_webkit_results': ActiveMaster.is_production_host, 1395 'archive_webkit_results': ActiveMaster.is_production_host,
1395 'blink_config': 'blink', 1396 'blink_config': 'blink',
1396 'gclient_env': { 1397 'gclient_env': {
1398 'GYP_DEFINES': 'use_ash=0 use_aura=0',
1397 'GYP_GENERATORS': 'ninja', 1399 'GYP_GENERATORS': 'ninja',
1398 }, 1400 },
1399 }), 1401 }),
1400 } 1402 }
1401 1403
1402 asan_gyp = ('asan=1 linux_use_tcmalloc=0 ' 1404 asan_gyp = ('asan=1 linux_use_tcmalloc=0 '
1403 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"') 1405 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"')
1404 1406
1405 b_linux_layout_asan = { 1407 b_linux_layout_asan = {
1406 'name': 'linux_layout_asan', 1408 'name': 'linux_layout_asan',
1407 # Reuse the directory. 1409 # Reuse the directory.
1408 'slavebuilddir': 'linux_layout', 1410 'slavebuilddir': 'linux_layout',
1409 'factory': m_chromium_linux.ChromiumFactory( 1411 'factory': m_chromium_linux.ChromiumFactory(
1410 slave_type='Trybot', 1412 slave_type='Trybot',
1411 target='Release', 1413 target='Release',
1412 tests=blink_tests, 1414 tests=blink_tests,
1413 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'], 1415 options=['--build-tool=ninja', '--compiler=goma', 'all_webkit'],
1414 factory_properties={ 1416 factory_properties={
1415 'additional_expectations': [ 1417 'additional_expectations': [
1416 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], 1418 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ],
1417 ], 1419 ],
1418 'archive_webkit_results': ActiveMaster.is_production_host, 1420 'archive_webkit_results': ActiveMaster.is_production_host,
1419 'asan': True, 1421 'asan': True,
1420 'blink_config': 'blink', 1422 'blink_config': 'blink',
1421 'gclient_env': { 1423 'gclient_env': {
1422 'GYP_DEFINES': asan_gyp, 1424 'GYP_DEFINES': asan_gyp + ' use_ash=0 use_aura=0',
1423 'GYP_GENERATORS': 'ninja', 1425 'GYP_GENERATORS': 'ninja',
1424 }, 1426 },
1425 'time_out_ms': '18000', 1427 'time_out_ms': '18000',
1426 }), 1428 }),
1427 } 1429 }
1428 1430
1429 b_mac_layout = { 1431 b_mac_layout = {
1430 'name': 'mac_layout', 1432 'name': 'mac_layout',
1431 'slavebuilddir': 'mac_layout', 1433 'slavebuilddir': 'mac_layout',
1432 'factory': m_chromium_mac_ninja.ChromiumFactory( 1434 'factory': m_chromium_mac_ninja.ChromiumFactory(
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
2345 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' 2347 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
2346 2348
2347 # Buildbot master url: 2349 # Buildbot master url:
2348 if ActiveMaster.is_production_host: 2350 if ActiveMaster.is_production_host:
2349 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/' 2351 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
2350 else: 2352 else:
2351 c['buildbotURL'] = 'http://%s:%d/' % ( 2353 c['buildbotURL'] = 'http://%s:%d/' % (
2352 socket.getfqdn(), ActiveMaster.master_port) 2354 socket.getfqdn(), ActiveMaster.master_port)
2353 2355
2354 # vi: set ts=4 sts=2 sw=2 et: 2356 # vi: set ts=4 sts=2 sw=2 et:
OLDNEW
« no previous file with comments | « masters/master.chromium.webkit/master_linux_webkit_pinned_cfg.py ('k') | scripts/slave/recipe_modules/chromium/config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698