| 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 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 master_site_config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = master_site_config.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 # | 47 # |
| 48 # Win Rel Builder | 48 # Win Rel Builder |
| 49 # | 49 # |
| 50 B('WebKit Win Builder (deps)', 'f_webkit_win_rel', | 50 B('WebKit Win Builder (deps)', 'f_webkit_win_rel', |
| 51 scheduler='global_scheduler', builddir='webkit-win-pinned-rel', | 51 scheduler='global_scheduler', builddir='webkit-win-pinned-rel', |
| 52 auto_reboot=False) | 52 auto_reboot=False) |
| 53 F('f_webkit_win_rel', win().ChromiumFactory( | 53 F('f_webkit_win_rel', win().ChromiumFactory( |
| 54 slave_type='Builder', | 54 slave_type='Builder', |
| 55 project='all.sln;all_webkit', | 55 project='all.sln;all_webkit', |
| 56 factory_properties={'trigger': 's1_chromium_rel_trigger'})) | 56 factory_properties={ |
| 57 'trigger': 's1_chromium_rel_trigger', |
| 58 'gclient_env': { |
| 59 'GYP_DEFINES': 'use_aura=0', |
| 60 }, |
| 61 })) |
| 57 | 62 |
| 58 # | 63 # |
| 59 # Win Rel WebKit testers | 64 # Win Rel WebKit testers |
| 60 # | 65 # |
| 61 B('WebKit XP (deps)', 'f_webkit_rel_tests', scheduler='s1_chromium_rel_trigger') | 66 B('WebKit XP (deps)', 'f_webkit_rel_tests', scheduler='s1_chromium_rel_trigger') |
| 62 F('f_webkit_rel_tests', win().ChromiumFactory( | 67 F('f_webkit_rel_tests', win().ChromiumFactory( |
| 63 slave_type='Tester', | 68 slave_type='Tester', |
| 64 build_url=rel_archive, | 69 build_url=rel_archive, |
| 65 tests=blink_tests, | 70 tests=blink_tests, |
| 66 factory_properties={ | 71 factory_properties={ |
| 67 'additional_expectations': [ | 72 'additional_expectations': [ |
| 68 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 73 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
| 69 ], | 74 ], |
| 70 'archive_webkit_results': ActiveMaster.is_production_host, | 75 'archive_webkit_results': ActiveMaster.is_production_host, |
| 71 'generate_gtest_json': True, | 76 'generate_gtest_json': True, |
| 72 'test_results_server': 'test-results.appspot.com', | 77 'test_results_server': 'test-results.appspot.com', |
| 73 })) | 78 })) |
| 74 | 79 |
| 75 def Update(_config, _active_master, c): | 80 def Update(_config, _active_master, c): |
| 76 return helper.Update(c) | 81 return helper.Update(c) |
| OLD | NEW |