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

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

Issue 10260008: Add all the linux tests to linux_clang but keep them off by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: now works Created 8 years, 7 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 # -*- 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 # These modules come from scripts, which must be in the PYTHONPATH. 10 # These modules come from scripts, which must be in the PYTHONPATH.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 for req in requests: 71 for req in requests:
72 if any(c.who == 'commit-bot@chromium.org' for c in req.source.changes): 72 if any(c.who == 'commit-bot@chromium.org' for c in req.source.changes):
73 return req 73 return req
74 return requests[0] 74 return requests[0]
75 75
76 76
77 def CreateBuilder(platform, builder_name, target, 77 def CreateBuilder(platform, builder_name, target,
78 tests=None, options=None, mode=None, timeout=2400, 78 tests=None, options=None, mode=None, timeout=2400,
79 slavebuilddir=None, extra_gyp_defines=None, 79 slavebuilddir=None, extra_gyp_defines=None,
80 gclient_env=None, sharded_tests=None, gyp_generators=None, 80 gclient_env=None, sharded_tests=None, gyp_generators=None,
81 asan=False): 81 asan=False, non_default=None):
82 """Generates and register a builder along with its slave(s).""" 82 """Generates and register a builder along with its slave(s)."""
83 if platform not in ('win32', 'win64', 'linux', 'mac', 83 if platform not in ('win32', 'win64', 'linux', 'mac',
84 'android', 'android_test'): 84 'android', 'android_test'):
85 raise Exception(platform + ' is not a known os type') 85 raise Exception(platform + ' is not a known os type')
86
86 factory_properties = { 87 factory_properties = {
87 'non_default': [ 88 'non_default': non_default or [
88 'check_licenses', 89 'check_licenses',
89 'courgette_unittests', 90 'courgette_unittests',
90 'googleurl_unittests', 91 'googleurl_unittests',
91 'pyauto_functional_tests', 92 'pyauto_functional_tests',
92 'sync_integration_tests', 93 'sync_integration_tests',
93 'webkit', 94 'webkit',
94 ], 95 ],
95 'gclient_env': { 96 'gclient_env': {
96 'GYP_DEFINES': '', 97 'GYP_DEFINES': '',
97 }, 98 },
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 tests=['chrome_frame_tests', 'chrome_frame_net_tests'], 868 tests=['chrome_frame_tests', 'chrome_frame_net_tests'],
868 builder_name='win_cf', 869 builder_name='win_cf',
869 slavebuilddir='win', 870 slavebuilddir='win',
870 extra_gyp_defines='fastbuild=0') 871 extra_gyp_defines='fastbuild=0')
871 872
872 # Clang builders 873 # Clang builders
873 b_linux_clang = CreateBuilder( 874 b_linux_clang = CreateBuilder(
874 platform='linux', 875 platform='linux',
875 target='Debug', 876 target='Debug',
876 options=['--build-tool=make', '--compiler=goma-clang'], 877 options=['--build-tool=make', '--compiler=goma-clang'],
877 tests=[], 878 tests=linux_tests,
878 extra_gyp_defines='clang=1 clang_use_chrome_plugins=1', 879 extra_gyp_defines='clang=1 clang_use_chrome_plugins=1',
879 builder_name='linux_clang') 880 builder_name='linux_clang',
881 # Keep all tests off by default.
882 non_default=linux_tests)
nsylvain 2012/04/30 15:39:38 i thought non_default took the display name, and n
880 883
881 b_linux_clang_no_goma = CreateBuilder( 884 b_linux_clang_no_goma = CreateBuilder(
882 platform='linux', 885 platform='linux',
883 target='Debug', 886 target='Debug',
884 options=['--build-tool=make', '--compiler=clang'], 887 options=['--build-tool=make', '--compiler=clang'],
885 tests=[], 888 tests=[],
886 extra_gyp_defines='clang=1 clang_use_chrome_plugins=1', 889 extra_gyp_defines='clang=1 clang_use_chrome_plugins=1',
887 builder_name='linux_clang_no_goma', 890 builder_name='linux_clang_no_goma',
888 slavebuilddir='linux_clang') 891 slavebuilddir='linux_clang')
889 892
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 ####### PROJECT IDENTITY 1383 ####### PROJECT IDENTITY
1381 1384
1382 # The 'projectURL' string will be used to provide a link 1385 # The 'projectURL' string will be used to provide a link
1383 # from buildbot HTML pages to your project's home page. 1386 # from buildbot HTML pages to your project's home page.
1384 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage' 1387 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
1385 1388
1386 # Buildbot master url: 1389 # Buildbot master url:
1387 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/' 1390 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
1388 1391
1389 # vi: set ts=4 sts=2 sw=2 et: 1392 # vi: set ts=4 sts=2 sw=2 et:
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