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