| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 # | 68 # |
| 69 B('GPU Mac', 'f_gpu_mac_rel', auto_reboot=True, | 69 B('GPU Mac', 'f_gpu_mac_rel', auto_reboot=True, |
| 70 scheduler='s8_webkit_rel') | 70 scheduler='s8_webkit_rel') |
| 71 F('f_gpu_mac_rel', mac().ChromiumWebkitLatestFactory( | 71 F('f_gpu_mac_rel', mac().ChromiumWebkitLatestFactory( |
| 72 target='Release', | 72 target='Release', |
| 73 options=['--build-tool=make', '--compiler=goma-clang', | 73 options=['--build-tool=make', '--compiler=goma-clang', |
| 74 'chromium_gpu_builder'], | 74 'chromium_gpu_builder'], |
| 75 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], | 75 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], |
| 76 factory_properties={ | 76 factory_properties={ |
| 77 'generate_gtest_json': True, | 77 'generate_gtest_json': True, |
| 78 'perf_id': 'gpu-webkit-mac', |
| 79 'show_perf_results': True, |
| 78 'gclient_env': { | 80 'gclient_env': { |
| 79 'GYP_GENERATORS':'make', | 81 'GYP_GENERATORS':'make', |
| 80 'GYP_DEFINES':'fastbuild=1', | 82 'GYP_DEFINES':'fastbuild=1', |
| 81 }, | 83 }, |
| 82 })) | 84 })) |
| 83 | 85 |
| 84 ################################################################################ | 86 ################################################################################ |
| 85 ## Debug | 87 ## Debug |
| 86 ################################################################################ | 88 ################################################################################ |
| 87 | 89 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 112 factory_properties={ | 114 factory_properties={ |
| 113 'generate_gtest_json': True, | 115 'generate_gtest_json': True, |
| 114 'gclient_env': { | 116 'gclient_env': { |
| 115 'GYP_GENERATORS':'make', | 117 'GYP_GENERATORS':'make', |
| 116 'GYP_DEFINES':'fastbuild=1', | 118 'GYP_DEFINES':'fastbuild=1', |
| 117 }, | 119 }, |
| 118 })) | 120 })) |
| 119 | 121 |
| 120 def Update(config, active_master, c): | 122 def Update(config, active_master, c): |
| 121 return helper.Update(c) | 123 return helper.Update(c) |
| OLD | NEW |