Index: masters/master.chromium.webkit/master_mac_latest_cfg.py |
diff --git a/masters/master.chromium.webkit/master_mac_latest_cfg.py b/masters/master.chromium.webkit/master_mac_latest_cfg.py |
index bfc64815f0685d58636ba2bc71464ff9d47f8a06..251de7e65270246e0e5821f05d906a3c4abc9758 100644 |
--- a/masters/master.chromium.webkit/master_mac_latest_cfg.py |
+++ b/masters/master.chromium.webkit/master_mac_latest_cfg.py |
@@ -36,6 +36,7 @@ F('f_mac_tests_rel', mac_out().ChromiumFactory( |
'cc_unittests', |
'content_browsertests', |
'interactive_ui_tests', |
+ 'telemetry_unittests', |
'unit', |
'webkit_compositor_bindings_unittests', |
], |
@@ -48,40 +49,6 @@ F('f_mac_tests_rel', mac_out().ChromiumFactory( |
'blink_config': 'blink', |
})) |
-B('Mac10.6 Perf', 'f_mac_perf6_rel', scheduler='global_scheduler') |
-F('f_mac_perf6_rel', mac_out().ChromiumFactory( |
- options=['--build-tool=ninja', '--compiler=goma-clang', '--', |
- 'chromium_builder_perf'], |
- tests=[ |
- 'blink_perf', |
- 'dom_perf', |
- 'dromaeo', |
- 'memory', |
- 'page_cycler_bloat', |
- 'page_cycler_dhtml', |
- 'page_cycler_indexeddb', |
- 'page_cycler_intl_ar_fa_he', |
- 'page_cycler_intl_es_fr_pt-BR', |
- 'page_cycler_intl_hi_ru', |
- 'page_cycler_intl_ja_zh', |
- 'page_cycler_intl_ko_th_vi', |
- 'page_cycler_morejs', |
- 'page_cycler_moz', |
- 'page_cycler_typical_25', |
- 'startup', |
- 'sunspider', |
- 'tab_switching', |
- 'octane', |
- ], |
- factory_properties={ |
- 'show_perf_results': True, |
- 'perf_id': 'chromium-rel-mac6-webkit', |
- 'gclient_env': { |
- 'GYP_GENERATORS':'ninja', |
- 'GYP_DEFINES': 'fastbuild=1', |
- }, |
- 'blink_config': 'blink', |
- })) |
B('Mac10.8 Tests', 'f_mac_tests_rel_108', scheduler='global_scheduler') |
F('f_mac_tests_rel_108', mac_out().ChromiumFactory( |
@@ -92,6 +59,7 @@ F('f_mac_tests_rel_108', mac_out().ChromiumFactory( |
'browser_tests', |
'content_browsertests', |
'interactive_ui_tests', |
+ 'telemetry_unittests', |
'unit', |
], |
factory_properties={ |