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

Side by Side Diff: masters/master.chromium.webkit/master_linux_contentshell_latest_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 5
6 from master import master_config 6 from master import master_config
7 from master.factory import chromium_factory 7 from master.factory import chromium_factory
8 8
9 import config 9 import config
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'webkit', 44 'webkit',
45 ], 45 ],
46 options=[ 46 options=[
47 '--build-tool=ninja', 47 '--build-tool=ninja',
48 '--compiler=goma', 48 '--compiler=goma',
49 '--', 49 '--',
50 'content_shell_builder', 50 'content_shell_builder',
51 ], 51 ],
52 factory_properties={ 52 factory_properties={
53 'additional_drt_flag': '--dump-render-tree', 53 'additional_drt_flag': '--dump-render-tree',
54 'additional_expectations_files': [ 54 'additional_expectations': [
55 [ 'third_party', 55 [ 'third_party',
56 'WebKit', 56 'WebKit',
57 'LayoutTests', 57 'LayoutTests',
58 'platform', 58 'platform',
59 'chromium', 59 'chromium',
60 'ContentShellTestExpectations' ], 60 'ContentShellTestExpectations' ],
61 ], 61 ],
62 'archive_webkit_results': ActiveMaster.is_production_host, 62 'archive_webkit_results': ActiveMaster.is_production_host,
63 'driver_name': 'content_shell', 63 'driver_name': 'content_shell',
64 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, 64 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
65 'test_results_server': 'test-results.appspot.com', 65 'test_results_server': 'test-results.appspot.com',
66 })) 66 }))
67 67
68 68
69 def Update(_config, active_master, c): 69 def Update(_config, active_master, c):
70 return helper.Update(c) 70 return helper.Update(c)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698