Chromium Code Reviews| Index: master/master_builders_cfg.py |
| diff --git a/master/master_builders_cfg.py b/master/master_builders_cfg.py |
| index d98fe36e4baaa94d063c3f304efd9bbbc487ff1f..881915a2ca3c840d7462be4f939afc42e9a04026 100644 |
| --- a/master/master_builders_cfg.py |
| +++ b/master/master_builders_cfg.py |
| @@ -316,7 +316,7 @@ def setup_test_and_perf_builders(helper, do_upload_render_results, |
| ('Test', 'Ubuntu13.10', 'ShuttleA', 'HD2000', 'x86_64', 'Debug', 'ASAN', None, f_xsan, LINUX, S_PERCOMMIT, {'sanitizer': 'address'}), |
| ('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86', 'Debug', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| - ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, GYP_10_6, f_factory, MAC, S_COMMIT_OR_SKP, {}), |
| + ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None, GYP_10_6, f_factory, MAC, S_PERCOMMIT, {}), |
| @@ -328,7 +328,7 @@ def setup_test_and_perf_builders(helper, do_upload_render_results, |
| ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None, None, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86', 'Debug', None, None, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, None, f_factory, MAC, S_PERCOMMIT, {}), |
| - ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, None, f_factory, MAC, S_PERCOMMIT, {}), |
| + ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86', 'Release', None, None, f_factory, MAC, S_COMMIT_OR_SKP, {}), |
|
benchen
2014/05/23 13:51:19
Note: we switched perf trigger bot for Mac from 10
|
| ('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug', None, None, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None, PDFVIEWER, f_factory, MAC, S_PERCOMMIT, {}), |
| ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None, PDFVIEWER, f_factory, MAC, S_PERCOMMIT, {}), |
| @@ -346,13 +346,13 @@ def setup_test_and_perf_builders(helper, do_upload_render_results, |
| ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'x86', 'Release', 'DirectWrite', GYP_DW, f_factory, WIN32, S_PERCOMMIT, {}), |
| ('Test', 'Win8', 'ShuttleA', 'GTX660', 'x86', 'Debug', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'GTX660', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| - ('Perf', 'Win8', 'ShuttleA', 'GTX660', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| + ('Perf', 'Win8', 'ShuttleA', 'GTX660', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_COMMIT_OR_SKP, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'GTX660', 'x86_64', 'Debug', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'GTX660', 'x86_64', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Perf', 'Win8', 'ShuttleA', 'GTX660', 'x86_64', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'HD7770', 'x86', 'Debug', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'HD7770', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| - ('Perf', 'Win8', 'ShuttleA', 'HD7770', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| + ('Perf', 'Win8', 'ShuttleA', 'HD7770', 'x86', 'Release', None, GYP_WIN8, f_factory, WIN32, S_COMMIT_OR_SKP, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Test', 'Win8', 'ShuttleA', 'HD7770', 'x86_64', 'Debug', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
|
borenet
2014/05/23 14:13:44
Do we only care about 32-bit right now? Should we
bsalomon
2014/05/23 14:24:51
chrome is shipping 32bit on windows still, I belie
|
| ('Test', 'Win8', 'ShuttleA', 'HD7770', 'x86_64', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |
| ('Perf', 'Win8', 'ShuttleA', 'HD7770', 'x86_64', 'Release', None, GYP_WIN8, f_factory, WIN32, S_PERCOMMIT, {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}), |