| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 # | 31 # |
| 32 # Linux Rel tests | 32 # Linux Rel tests |
| 33 # | 33 # |
| 34 | 34 |
| 35 B('GPU Linux (NVIDIA)', 'f_gpu_linux_rel', scheduler='s9_gpu_linux_webkit_rel', | 35 B('GPU Linux (NVIDIA)', 'f_gpu_linux_rel', scheduler='s9_gpu_linux_webkit_rel', |
| 36 auto_reboot=False) | 36 auto_reboot=False) |
| 37 F('f_gpu_linux_rel', linux().ChromiumWebkitLatestFactory( | 37 F('f_gpu_linux_rel', linux().ChromiumWebkitLatestFactory( |
| 38 target='Release', | 38 target='Release', |
| 39 tests=[ | 39 tests=[ |
| 40 'gl_tests', | 40 'gl_tests', |
| 41 'gpu_frame_rate', | 41 'gpu_frame_rate', |
| 42 'gpu_latency', | 42 'gpu_latency', |
| 43 'gpu_throughput', | 43 'gpu_throughput', |
| 44 'gpu_tests', | 44 'gpu_tests', |
| 45 'gpu_content_tests', | 45 'gpu_content_tests', |
| 46 ], | 46 ], |
| 47 options=['--compiler=goma', 'chromium_gpu_builder'], | 47 options=[ |
| 48 '--build-tool=ninja', |
| 49 '--compiler=goma', |
| 50 '--', |
| 51 'chromium_gpu_builder', |
| 52 ], |
| 48 factory_properties={ | 53 factory_properties={ |
| 49 'generate_gtest_json': True, | 54 'generate_gtest_json': True, |
| 50 'perf_id': 'gpu-webkit-linux-nvidia', | 55 'perf_id': 'gpu-webkit-linux-nvidia', |
| 51 'show_perf_results': True, | 56 'show_perf_results': True, |
| 57 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 52 })) | 58 })) |
| 53 | 59 |
| 54 ################################################################################ | 60 ################################################################################ |
| 55 ## Debug | 61 ## Debug |
| 56 ################################################################################ | 62 ################################################################################ |
| 57 | 63 |
| 58 # | 64 # |
| 59 # Main debug scheduler for webkit | 65 # Main debug scheduler for webkit |
| 60 # | 66 # |
| 61 S('s9_gpu_linux_webkit_dbg', branch='trunk', treeStableTimer=60) | 67 S('s9_gpu_linux_webkit_dbg', branch='trunk', treeStableTimer=60) |
| 62 | 68 |
| 63 B('GPU Linux (dbg) (NVIDIA)', 'f_gpu_linux_dbg', | 69 B('GPU Linux (dbg) (NVIDIA)', 'f_gpu_linux_dbg', |
| 64 scheduler='s9_gpu_linux_webkit_dbg', auto_reboot=False) | 70 scheduler='s9_gpu_linux_webkit_dbg', auto_reboot=False) |
| 65 F('f_gpu_linux_dbg', linux().ChromiumWebkitLatestFactory( | 71 F('f_gpu_linux_dbg', linux().ChromiumWebkitLatestFactory( |
| 66 target='Debug', | 72 target='Debug', |
| 67 tests=[ | 73 tests=[ |
| 68 'gl_tests', | 74 'gl_tests', |
| 69 'gpu_tests', | 75 'gpu_tests', |
| 70 'gpu_content_tests', | 76 'gpu_content_tests', |
| 71 ], | 77 ], |
| 72 options=['--compiler=goma', 'chromium_gpu_debug_builder'], | 78 options=[ |
| 73 factory_properties={'generate_gtest_json': True})) | 79 '--build-tool=ninja', |
| 80 '--compiler=goma', |
| 81 '--', |
| 82 'chromium_gpu_debug_builder' |
| 83 ], |
| 84 factory_properties={ |
| 85 'generate_gtest_json': True, |
| 86 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 87 })) |
| 74 | 88 |
| 75 | 89 |
| 76 def Update(config, active_master, c): | 90 def Update(config, active_master, c): |
| 77 return helper.Update(c) | 91 return helper.Update(c) |
| OLD | NEW |