| OLD | NEW |
| 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 # Webkit test builders using the Skia graphics library. | 5 # WebKit test builders using the Skia graphics library. |
| 6 | 6 |
| 7 from master import master_config | 7 from master import master_config |
| 8 from master.factory import chromium_factory | 8 from master.factory import chromium_factory |
| 9 | 9 |
| 10 defaults = {} | 10 defaults = {} |
| 11 | 11 |
| 12 helper = master_config.Helper(defaults) | 12 helper = master_config.Helper(defaults) |
| 13 B = helper.Builder | 13 B = helper.Builder |
| 14 D = helper.Dependent | 14 D = helper.Dependent |
| 15 F = helper.Factory | 15 F = helper.Factory |
| 16 S = helper.Scheduler | 16 S = helper.Scheduler |
| 17 | 17 |
| 18 def mac(): return chromium_factory.ChromiumFactory('src/build', 'darwin') | 18 def mac(): return chromium_factory.ChromiumFactory('src/build', 'darwin') |
| 19 | 19 |
| 20 defaults['category'] = '2webkit mac deps' | 20 defaults['category'] = '2webkit mac deps' |
| 21 | 21 |
| 22 ################################################################################ | 22 ################################################################################ |
| 23 ## Release | 23 ## Release |
| 24 ################################################################################ | 24 ################################################################################ |
| 25 | 25 |
| 26 # Archive location | 26 # Archive location |
| 27 rel_builddir = 'webkit-mac-pinned-rel' | 27 rel_builddir = 'webkit-mac-pinned-rel' |
| 28 rel_archive = master_config.GetArchiveUrl( | 28 rel_archive = master_config.GetArchiveUrl('ChromiumWebkit', |
| 29 'ChromiumWebkit', 'Webkit Mac Builder (deps)', | 29 'WebKit Mac Builder (deps)', |
| 30 rel_builddir, 'mac') | 30 rel_builddir, 'mac') |
| 31 | 31 |
| 32 # | 32 # |
| 33 # Main release scheduler for chromium | 33 # Main release scheduler for chromium |
| 34 # | 34 # |
| 35 rel_scheduler = 's2_chromium_rel' | 35 rel_scheduler = 's2_chromium_rel' |
| 36 S(rel_scheduler, branch='src', treeStableTimer=60) | 36 S(rel_scheduler, branch='src', treeStableTimer=60) |
| 37 | 37 |
| 38 # | 38 # |
| 39 # Dependent scheduler for the dbg builder | 39 # Dependent scheduler for the dbg builder |
| 40 # | 40 # |
| 41 rel_dep_scheduler = 's2_chromium_rel_dep' | 41 rel_dep_scheduler = 's2_chromium_rel_dep' |
| 42 D(rel_dep_scheduler, rel_scheduler) | 42 D(rel_dep_scheduler, rel_scheduler) |
| 43 | 43 |
| 44 # | 44 # |
| 45 # Mac Rel Builder | 45 # Mac Rel Builder |
| 46 # | 46 # |
| 47 B('Webkit Mac Builder (deps)', 'f_webkit_mac_rel', auto_reboot=False, | 47 B('WebKit Mac Builder (deps)', 'f_webkit_mac_rel', auto_reboot=False, |
| 48 scheduler=rel_scheduler, builddir=rel_builddir) | 48 scheduler=rel_scheduler, builddir=rel_builddir) |
| 49 F('f_webkit_mac_rel', mac().ChromiumFactory( | 49 F('f_webkit_mac_rel', mac().ChromiumFactory( |
| 50 slave_type='Builder', | 50 slave_type='Builder', |
| 51 options=[ | 51 options=[ |
| 52 '--compiler=clang','--', '-project', '../webkit/webkit.xcodeproj'], | 52 '--compiler=clang','--', '-project', '../webkit/webkit.xcodeproj'], |
| 53 factory_properties={ | 53 factory_properties={ |
| 54 'gclient_env': { | 54 'gclient_env': { |
| 55 'GYP_DEFINES':'use_skia=1' | 55 'GYP_DEFINES':'use_skia=1' |
| 56 }, | 56 }, |
| 57 'layout_test_platform': 'chromium-mac', | 57 'layout_test_platform': 'chromium-mac', |
| 58 })) | 58 })) |
| 59 | 59 |
| 60 # | 60 # |
| 61 # Mac Rel Webkit testers | 61 # Mac Rel WebKit testers |
| 62 # | 62 # |
| 63 B('Webkit Mac10.6 (deps)', 'f_webkit_rel_tests', scheduler=rel_dep_scheduler) | 63 B('WebKit Mac10.6 (deps)', 'f_webkit_rel_tests', scheduler=rel_dep_scheduler) |
| 64 F('f_webkit_rel_tests', mac().ChromiumFactory( | 64 F('f_webkit_rel_tests', mac().ChromiumFactory( |
| 65 slave_type='Tester', | 65 slave_type='Tester', |
| 66 build_url=rel_archive, | 66 build_url=rel_archive, |
| 67 tests=[ | 67 tests=[ |
| 68 'test_shell', | 68 'test_shell', |
| 69 'webkit', | 69 'webkit', |
| 70 'webkit_lint', | 70 'webkit_lint', |
| 71 'webkit_unit', | 71 'webkit_unit', |
| 72 ], | 72 ], |
| 73 factory_properties={ | 73 factory_properties={ |
| 74 'additional_expectations_files': [ | 74 'additional_expectations_files': [ |
| 75 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 75 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
| 76 ], | 76 ], |
| 77 'archive_webkit_results': True, | 77 'archive_webkit_results': True, |
| 78 'generate_gtest_json': True, | 78 'generate_gtest_json': True, |
| 79 'layout_test_platform': 'chromium-mac', | 79 'layout_test_platform': 'chromium-mac', |
| 80 'test_results_server': 'test-results.appspot.com', | 80 'test_results_server': 'test-results.appspot.com', |
| 81 })) | 81 })) |
| 82 | 82 |
| 83 ################################################################################ | 83 ################################################################################ |
| 84 ## | 84 ## |
| 85 ################################################################################ | 85 ################################################################################ |
| 86 | 86 |
| 87 def Update(config, active_master, c): | 87 def Update(config, active_master, c): |
| 88 return helper.Update(c) | 88 return helper.Update(c) |
| OLD | NEW |