| 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 12 matching lines...) Expand all Loading... |
| 23 defaults['category'] = '9gpu' | 23 defaults['category'] = '9gpu' |
| 24 | 24 |
| 25 # | 25 # |
| 26 # Main release scheduler for webkit | 26 # Main release scheduler for webkit |
| 27 # | 27 # |
| 28 S('s9_gpu_mac_webkit_rel', branch='trunk', treeStableTimer=60) | 28 S('s9_gpu_mac_webkit_rel', branch='trunk', treeStableTimer=60) |
| 29 | 29 |
| 30 # | 30 # |
| 31 # GPU Mac Release | 31 # GPU Mac Release |
| 32 # | 32 # |
| 33 B('GPU Mac', 'f_gpu_mac_rel', scheduler='s9_gpu_mac_webkit_rel') | 33 B('GPU Mac10.7', 'f_gpu_mac_rel', scheduler='s9_gpu_mac_webkit_rel') |
| 34 F('f_gpu_mac_rel', mac().ChromiumWebkitLatestFactory( | 34 F('f_gpu_mac_rel', mac().ChromiumWebkitLatestFactory( |
| 35 target='Release', | 35 target='Release', |
| 36 options=['--build-tool=ninja', '--compiler=goma-clang', | 36 options=['--build-tool=ninja', '--compiler=goma-clang', |
| 37 'chromium_gpu_builder'], | 37 'chromium_gpu_builder'], |
| 38 tests=[ | 38 tests=[ |
| 39 'gl_tests', | 39 'gl_tests', |
| 40 'gpu_frame_rate', | 40 'gpu_frame_rate', |
| 41 'gpu_latency', | 41 'gpu_latency', |
| 42 'gpu_tests', | 42 'gpu_tests', |
| 43 'gpu_throughput', | 43 'gpu_throughput', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 57 ################################################################################ | 57 ################################################################################ |
| 58 | 58 |
| 59 # | 59 # |
| 60 # Main debug scheduler for webkit | 60 # Main debug scheduler for webkit |
| 61 # | 61 # |
| 62 S('s9_gpu_mac_webkit_dbg', branch='trunk', treeStableTimer=60) | 62 S('s9_gpu_mac_webkit_dbg', branch='trunk', treeStableTimer=60) |
| 63 | 63 |
| 64 # | 64 # |
| 65 # GPU Mac Debug | 65 # GPU Mac Debug |
| 66 # | 66 # |
| 67 B('GPU Mac (dbg)', 'f_gpu_mac_dbg', scheduler='s9_gpu_mac_webkit_dbg') | 67 B('GPU Mac10.7 (dbg)', 'f_gpu_mac_dbg', scheduler='s9_gpu_mac_webkit_dbg') |
| 68 F('f_gpu_mac_dbg', mac().ChromiumWebkitLatestFactory( | 68 F('f_gpu_mac_dbg', mac().ChromiumWebkitLatestFactory( |
| 69 target='Debug', | 69 target='Debug', |
| 70 options=['--build-tool=ninja', '--compiler=goma-clang', | 70 options=['--build-tool=ninja', '--compiler=goma-clang', |
| 71 'chromium_gpu_debug_builder'], | 71 'chromium_gpu_debug_builder'], |
| 72 tests=[ | 72 tests=[ |
| 73 'gl_tests', | 73 'gl_tests', |
| 74 'gpu_tests', | 74 'gpu_tests', |
| 75 ], | 75 ], |
| 76 factory_properties={ | 76 factory_properties={ |
| 77 'generate_gtest_json': True, | 77 'generate_gtest_json': True, |
| 78 'gclient_env': { | 78 'gclient_env': { |
| 79 'GYP_GENERATORS':'ninja', | 79 'GYP_GENERATORS':'ninja', |
| 80 'GYP_DEFINES':'fastbuild=1', | 80 'GYP_DEFINES':'fastbuild=1', |
| 81 }, | 81 }, |
| 82 })) | 82 })) |
| 83 | 83 |
| 84 def Update(config, active_master, c): | 84 def Update(config, active_master, c): |
| 85 return helper.Update(c) | 85 return helper.Update(c) |
| OLD | NEW |