| 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 14 matching lines...) Expand all Loading... |
| 25 # Main release scheduler for webkit | 25 # Main release scheduler for webkit |
| 26 # | 26 # |
| 27 S('s6_webkit_rel', branch='trunk', treeStableTimer=60) | 27 S('s6_webkit_rel', branch='trunk', treeStableTimer=60) |
| 28 | 28 |
| 29 # | 29 # |
| 30 # Linux Rel Builder/Tester | 30 # Linux Rel Builder/Tester |
| 31 # | 31 # |
| 32 B('WebKit Linux', 'f_webkit_linux_rel', scheduler='s6_webkit_rel') | 32 B('WebKit Linux', 'f_webkit_linux_rel', scheduler='s6_webkit_rel') |
| 33 F('f_webkit_linux_rel', linux().ChromiumWebkitLatestFactory( | 33 F('f_webkit_linux_rel', linux().ChromiumWebkitLatestFactory( |
| 34 tests=[ | 34 tests=[ |
| 35 'test_shell', | 35 'test_shell', |
| 36 'webkit', | 36 'webkit', |
| 37 'webkit_lint', | 37 'webkit_lint', |
| 38 'webkit_unit', | 38 'webkit_unit', |
| 39 ], | 39 ], |
| 40 options=[ | 40 options=[ |
| 41 '--compiler=goma', | 41 '--build-tool=ninja', |
| 42 'DumpRenderTree', | 42 '--compiler=goma', |
| 43 'test_shell', | 43 '--', |
| 44 'test_shell_tests', | 44 'DumpRenderTree', |
| 45 'webkit_unit_tests', | 45 'test_shell', |
| 46 'test_shell_tests', |
| 47 'webkit_unit_tests', |
| 46 ], | 48 ], |
| 47 factory_properties={'archive_webkit_results': True, | 49 factory_properties={ |
| 48 'generate_gtest_json': True, | 50 'archive_webkit_results': True, |
| 49 'test_results_server': 'test-results.appspot.com'})) | 51 'generate_gtest_json': True, |
| 52 'test_results_server': 'test-results.appspot.com', |
| 53 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 54 })) |
| 50 | 55 |
| 51 B('WebKit Linux 32', 'f_webkit_linux_rel', scheduler='s6_webkit_rel') | 56 B('WebKit Linux 32', 'f_webkit_linux_rel', scheduler='s6_webkit_rel') |
| 52 | 57 |
| 53 asan_gyp = ('asan=1 linux_use_tcmalloc=0 ' | 58 asan_gyp = ('asan=1 linux_use_tcmalloc=0 ' |
| 54 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"') | 59 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"') |
| 55 | 60 |
| 56 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='s6_webkit_rel', | 61 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='s6_webkit_rel', |
| 57 auto_reboot=False) | 62 auto_reboot=False) |
| 58 F('f_webkit_linux_rel_asan', linux().ChromiumWebkitLatestFactory( | 63 F('f_webkit_linux_rel_asan', linux().ChromiumWebkitLatestFactory( |
| 59 tests=['webkit'], | 64 tests=['webkit'], |
| 60 options=['--compiler=goma-clang', 'DumpRenderTree'], | 65 options=[ |
| 66 '--build-tool=ninja', |
| 67 '--compiler=goma-clang', |
| 68 '--', |
| 69 'DumpRenderTree' |
| 70 ], |
| 61 factory_properties={ | 71 factory_properties={ |
| 62 'additional_expectations_files': [ | 72 'additional_expectations_files': [ |
| 63 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], | 73 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], |
| 64 ], | 74 ], |
| 65 'gs_bucket': 'gs://webkit-asan', | 75 'gs_bucket': 'gs://webkit-asan', |
| 66 'gclient_env': {'GYP_DEFINES': asan_gyp}, | 76 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'}, |
| 67 'time_out_ms': '18000'})) | 77 'time_out_ms': '18000' |
| 78 })) |
| 68 | 79 |
| 69 | 80 |
| 70 ################################################################################ | 81 ################################################################################ |
| 71 ## Debug | 82 ## Debug |
| 72 ################################################################################ | 83 ################################################################################ |
| 73 | 84 |
| 74 # | 85 # |
| 75 # Main debug scheduler for webkit | 86 # Main debug scheduler for webkit |
| 76 # | 87 # |
| 77 S('s6_webkit_dbg', branch='trunk', treeStableTimer=60) | 88 S('s6_webkit_dbg', branch='trunk', treeStableTimer=60) |
| 78 | 89 |
| 79 # | 90 # |
| 80 # Linux Dbg Webkit builders/testers | 91 # Linux Dbg Webkit builders/testers |
| 81 # | 92 # |
| 82 | 93 |
| 83 B('WebKit Linux (dbg)', 'f_webkit_dbg_tests', scheduler='s6_webkit_dbg', | 94 B('WebKit Linux (dbg)', 'f_webkit_dbg_tests', scheduler='s6_webkit_dbg', |
| 84 auto_reboot=False) | 95 auto_reboot=False) |
| 85 F('f_webkit_dbg_tests', linux().ChromiumWebkitLatestFactory( | 96 F('f_webkit_dbg_tests', linux().ChromiumWebkitLatestFactory( |
| 86 target='Debug', | 97 target='Debug', |
| 87 tests=[ | 98 tests=[ |
| 88 'test_shell', | 99 'test_shell', |
| 89 'webkit', | 100 'webkit', |
| 90 'webkit_lint', | 101 'webkit_lint', |
| 91 'webkit_unit', | 102 'webkit_unit', |
| 92 ], | 103 ], |
| 93 options=[ | 104 options=[ |
| 94 '--compiler=goma', | 105 '--build-tool=ninja', |
| 95 'test_shell', | 106 '--compiler=goma', |
| 96 'test_shell_tests', | 107 '--', |
| 97 'webkit_unit_tests', | 108 'test_shell', |
| 98 'DumpRenderTree', | 109 'test_shell_tests', |
| 110 'webkit_unit_tests', |
| 111 'DumpRenderTree', |
| 99 ], | 112 ], |
| 100 factory_properties={'archive_webkit_results': True, | 113 factory_properties={ |
| 101 'generate_gtest_json': True, | 114 'archive_webkit_results': True, |
| 102 'test_results_server': 'test-results.appspot.com'})) | 115 'generate_gtest_json': True, |
| 116 'test_results_server': 'test-results.appspot.com', |
| 117 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 118 })) |
| 103 | 119 |
| 104 def Update(config, active_master, c): | 120 def Update(config, active_master, c): |
| 105 return helper.Update(c) | 121 return helper.Update(c) |
| OLD | NEW |