| 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 defaults = {} |   8 defaults = {} | 
|   9  |   9  | 
|  10 helper = master_config.Helper(defaults) |  10 helper = master_config.Helper(defaults) | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
|  21                                           nohooks_on_update=True) |  21                                           nohooks_on_update=True) | 
|  22  |  22  | 
|  23 S('mac_rel_scheduler', branch='src', treeStableTimer=60) |  23 S('mac_rel_scheduler', branch='src', treeStableTimer=60) | 
|  24 T('mac_rel_trigger') |  24 T('mac_rel_trigger') | 
|  25  |  25  | 
|  26 chromium_rel_mac_archive = master_config.GetArchiveUrl('ChromiumWebRTC', |  26 chromium_rel_mac_archive = master_config.GetArchiveUrl('ChromiumWebRTC', | 
|  27     'Mac Builder', |  27     'Mac Builder', | 
|  28     'chromium-webrtc-rel-mac-builder', |  28     'chromium-webrtc-rel-mac-builder', | 
|  29     'mac') |  29     'mac') | 
|  30  |  30  | 
|  31 tests = ['pyauto_webrtc_tests'] |  31 tests = [ | 
 |  32     'pyauto_webrtc_tests', | 
 |  33     'pyauto_webrtc_apprtc_test', | 
 |  34     'pyauto_webrtc_quality_tests', | 
 |  35     'webrtc_manual_browser_tests', | 
 |  36     'webrtc_manual_content_browsertests', | 
 |  37     'webrtc_content_unittests', | 
 |  38     'webrtc_perf_content_unittests', | 
 |  39 ] | 
|  32  |  40  | 
|  33 defaults['category'] = 'mac' |  41 defaults['category'] = 'mac' | 
|  34  |  42  | 
|  35 B('Mac Builder', 'mac_rel_factory', scheduler='mac_rel_scheduler', |  43 B('Mac Builder', 'mac_rel_factory', scheduler='mac_rel_scheduler', | 
|  36   builddir='chromium-webrtc-rel-mac-builder', notify_on_missing=True) |  44   builddir='chromium-webrtc-rel-mac-builder', notify_on_missing=True) | 
|  37 F('mac_rel_factory', mac().ChromiumFactory( |  45 F('mac_rel_factory', mac().ChromiumFactory( | 
|  38     slave_type='Builder', |  46     slave_type='Builder', | 
|  39     target='Release', |  47     target='Release', | 
|  40     options=['--compiler=goma-clang', '--', '-target', |  48     options=['--compiler=goma-clang', '--', '-target', | 
|  41              'chromium_builder_webrtc'], |  49              'chromium_builder_webrtc'], | 
|  42     factory_properties={'trigger': 'mac_rel_trigger',})) |  50     factory_properties={'trigger': 'mac_rel_trigger',})) | 
|  43  |  51  | 
|  44 B('Mac Tester', 'mac_tester_factory', scheduler='mac_rel_trigger') |  52 B('Mac Tester', 'mac_tester_factory', scheduler='mac_rel_trigger') | 
|  45 F('mac_tester_factory', mac_tester().ChromiumFactory( |  53 F('mac_tester_factory', mac_tester().ChromiumFactory( | 
|  46     slave_type='Tester', |  54     slave_type='Tester', | 
|  47     build_url=chromium_rel_mac_archive, |  55     build_url=chromium_rel_mac_archive, | 
|  48     tests=tests, |  56     tests=tests, | 
|  49     factory_properties={ |  57     factory_properties={ | 
|  50         'show_perf_results': True, |  58         'show_perf_results': True, | 
|  51         'halt_on_missing_build': True, |  59         'halt_on_missing_build': True, | 
|  52         'perf_id': 'chromium-webrtc-rel-mac', |  60         'perf_id': 'chromium-webrtc-rel-mac', | 
|  53     })) |  61     })) | 
|  54  |  62  | 
|  55  |  63  | 
|  56 def Update(config, active_master, c): |  64 def Update(config, active_master, c): | 
|  57   helper.Update(c) |  65   helper.Update(c) | 
| OLD | NEW |