| 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 | 5 |
| 6 from master import master_config | 6 from master import master_config |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 defaults = {} | 9 defaults = {} |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 tests=['valgrind_test_shell'], | 58 tests=['valgrind_test_shell'], |
| 59 factory_properties={ | 59 factory_properties={ |
| 60 'needs_valgrind': True, | 60 'needs_valgrind': True, |
| 61 'gclient_env': {'GYP_DEFINES' : valgrind_gyp_defines,}})) | 61 'gclient_env': {'GYP_DEFINES' : valgrind_gyp_defines,}})) |
| 62 | 62 |
| 63 B('GPU Linux (NVIDIA)', 'f_gpu_linux_rel', scheduler='s9_webkit_rel') | 63 B('GPU Linux (NVIDIA)', 'f_gpu_linux_rel', scheduler='s9_webkit_rel') |
| 64 F('f_gpu_linux_rel', linux().ChromiumWebkitLatestFactory( | 64 F('f_gpu_linux_rel', linux().ChromiumWebkitLatestFactory( |
| 65 target='Release', | 65 target='Release', |
| 66 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], | 66 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], |
| 67 options=['--compiler=goma', 'chromium_gpu_builder'], | 67 options=['--compiler=goma', 'chromium_gpu_builder'], |
| 68 factory_properties={'generate_gtest_json': True})) | 68 factory_properties={ |
| 69 'generate_gtest_json': True, |
| 70 'perf_id': 'gpu-webkit-linux-nvidia', |
| 71 'show_perf_results': True, |
| 72 })) |
| 69 | 73 |
| 70 ################################################################################ | 74 ################################################################################ |
| 71 ## Debug | 75 ## Debug |
| 72 ################################################################################ | 76 ################################################################################ |
| 73 | 77 |
| 74 # | 78 # |
| 75 # Main debug scheduler for webkit | 79 # Main debug scheduler for webkit |
| 76 # | 80 # |
| 77 S('s9_webkit_dbg', branch='trunk', treeStableTimer=60) | 81 S('s9_webkit_dbg', branch='trunk', treeStableTimer=60) |
| 78 | 82 |
| 79 B('GPU Linux (dbg) (NVIDIA)', 'f_gpu_linux_dbg', scheduler='s9_webkit_dbg') | 83 B('GPU Linux (dbg) (NVIDIA)', 'f_gpu_linux_dbg', scheduler='s9_webkit_dbg') |
| 80 F('f_gpu_linux_dbg', linux().ChromiumWebkitLatestFactory( | 84 F('f_gpu_linux_dbg', linux().ChromiumWebkitLatestFactory( |
| 81 target='Debug', | 85 target='Debug', |
| 82 tests=['gpu_tests'], | 86 tests=['gpu_tests'], |
| 83 options=['--compiler=goma', 'chromium_gpu_debug_builder'], | 87 options=['--compiler=goma', 'chromium_gpu_debug_builder'], |
| 84 factory_properties={'generate_gtest_json': True})) | 88 factory_properties={'generate_gtest_json': True})) |
| 85 | 89 |
| 86 | 90 |
| 87 def Update(config, active_master, c): | 91 def Update(config, active_master, c): |
| 88 return helper.Update(c) | 92 return helper.Update(c) |
| OLD | NEW |