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

Side by Side Diff: masters/master.chromium.webkit/master_win_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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 F('f_webkit_rel_tests', win().ChromiumFactory( 58 F('f_webkit_rel_tests', win().ChromiumFactory(
59 slave_type='Tester', 59 slave_type='Tester',
60 build_url=rel_archive, 60 build_url=rel_archive,
61 tests=[ 61 tests=[
62 'test_shell', 62 'test_shell',
63 'webkit', 63 'webkit',
64 'webkit_lint', 64 'webkit_lint',
65 'webkit_unit', 65 'webkit_unit',
66 ], 66 ],
67 factory_properties={ 67 factory_properties={
68 'additional_expectations_files': [ 68 'additional_expectations': [
69 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], 69 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ],
70 ], 70 ],
71 'archive_webkit_results': ActiveMaster.is_production_host, 71 'archive_webkit_results': ActiveMaster.is_production_host,
72 'generate_gtest_json': True, 72 'generate_gtest_json': True,
73 'test_results_server': 'test-results.appspot.com', 73 'test_results_server': 'test-results.appspot.com',
74 })) 74 }))
75 75
76 def Update(_config, active_master, c): 76 def Update(_config, active_master, c):
77 return helper.Update(c) 77 return helper.Update(c)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698