OLD | NEW |
---|---|
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 25 matching lines...) Expand all Loading... | |
36 # Content Shell Layouttests | 36 # Content Shell Layouttests |
37 # | 37 # |
38 B('WebKit (Content Shell) Android', 'f_contentshell_android_rel', | 38 B('WebKit (Content Shell) Android', 'f_contentshell_android_rel', |
39 scheduler='s4_contentshell_webkit_rel') | 39 scheduler='s4_contentshell_webkit_rel') |
40 | 40 |
41 F('f_contentshell_android_rel', | 41 F('f_contentshell_android_rel', |
42 linux_android().ChromiumWebkitLatestAnnotationFactory( | 42 linux_android().ChromiumWebkitLatestAnnotationFactory( |
43 annotation_script='src/build/android/buildbot/bb_run_bot.py', | 43 annotation_script='src/build/android/buildbot/bb_run_bot.py', |
44 factory_properties={ | 44 factory_properties={ |
45 'additional_drt_flag': '--dump-render-tree', | 45 'additional_drt_flag': '--dump-render-tree', |
46 'additional_expectations_files': [ | 46 'additional_expectations': [ |
jochen (gone - plz use gerrit)
2013/03/19 20:19:32
this will break, since android uses the annotation
| |
47 [ 'third_party', | 47 [ 'third_party', |
48 'WebKit', | 48 'WebKit', |
49 'LayoutTests', | 49 'LayoutTests', |
50 'platform', | 50 'platform', |
51 'chromium', | 51 'chromium', |
52 'ContentShellTestExpectations' ], | 52 'ContentShellTestExpectations' ], |
53 ], | 53 ], |
54 'android_bot_id': 'webkit-latest-contentshell-rel', | 54 'android_bot_id': 'webkit-latest-contentshell-rel', |
55 'archive_webkit_results': ActiveMaster.is_production_host, | 55 'archive_webkit_results': ActiveMaster.is_production_host, |
56 'driver_name': 'content_shell', | 56 'driver_name': 'content_shell', |
57 'generate_gtest_json': True, | 57 'generate_gtest_json': True, |
58 'test_results_server': 'test-results.appspot.com', | 58 'test_results_server': 'test-results.appspot.com', |
59 })) | 59 })) |
60 | 60 |
61 def Update(_config, active_master, c): | 61 def Update(_config, active_master, c): |
62 return helper.Update(c) | 62 return helper.Update(c) |
OLD | NEW |