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

Side by Side Diff: masters/master.chromium.webkit/master_linux_webkit_pinned_cfg.py

Issue 12927002: use additional_expectations as a command parameter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 9 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 from master import master_config 5 from master import master_config
6 from master.factory import chromium_factory 6 from master.factory import chromium_factory
7 7
8 import config 8 import config
9 9
10 ActiveMaster = config.Master.ChromiumWebkit 10 ActiveMaster = config.Master.ChromiumWebkit
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 options=[ 45 options=[
46 '--build-tool=ninja', 46 '--build-tool=ninja',
47 '--compiler=goma', 47 '--compiler=goma',
48 '--', 48 '--',
49 'DumpRenderTree', 49 'DumpRenderTree',
50 'test_shell', 50 'test_shell',
51 'test_shell_tests', 51 'test_shell_tests',
52 'webkit_unit_tests', 52 'webkit_unit_tests',
53 ], 53 ],
54 factory_properties={ 54 factory_properties={
55 'additional_expectations_files': [ 55 'additional_expectations': [
56 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], 56 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ],
57 ], 57 ],
58 'archive_webkit_results': ActiveMaster.is_production_host, 58 'archive_webkit_results': ActiveMaster.is_production_host,
59 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, 59 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
60 'generate_gtest_json': True, 60 'generate_gtest_json': True,
61 'test_results_server': 'test-results.appspot.com', 61 'test_results_server': 'test-results.appspot.com',
62 })) 62 }))
63 63
64 def Update(_config, active_master, c): 64 def Update(_config, active_master, c):
65 return helper.Update(c) 65 return helper.Update(c)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698