Chromium Code Reviews| Index: testing/buildbot/chromium.linux.json |
| diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json |
| index 4a83e14d9751339cea469b3adf451639534ca908..c4f1c71aa3167b7853f7bea10c129707f1f11c65 100644 |
| --- a/testing/buildbot/chromium.linux.json |
| +++ b/testing/buildbot/chromium.linux.json |
| @@ -23,24 +23,116 @@ |
| "Android Tests": { |
| "gtest_tests": [ |
|
ghost stip (do not use)
2016/06/03 00:06:19
I just copied the config over from Android Swarm B
|
| { |
| + "override_compile_targets": [ |
| + "android_webview_test_apk" |
| + ], |
| + "override_isolate_target": "android_webview_test_apk", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 960 |
| + }, |
| + "test": "android_webview_test_apk" |
| + }, |
| + { |
| + "override_isolate_target": "android_webview_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "android_webview_unittests" |
| }, |
| { |
| + "override_isolate_target": "base_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "base_unittests" |
| }, |
| { |
| + "override_compile_targets": [ |
| + "blimp_test_apk" |
| + ], |
| + "override_isolate_target": "blimp_test_apk", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 960 |
| + }, |
| + "test": "blimp_test_apk" |
| + }, |
| + { |
| + "override_isolate_target": "blimp_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "blimp_unittests" |
| }, |
| { |
| + "override_isolate_target": "blink_heap_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 60 |
| + }, |
| "test": "blink_heap_unittests" |
| }, |
| { |
| - "override_compile_targets": [ |
| - "breakpad_unittests" |
| - ], |
| + "override_isolate_target": "breakpad_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "breakpad_unittests" |
| }, |
| { |
| + "override_isolate_target": "cc_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "cc_unittests" |
| }, |
| { |
| @@ -61,9 +153,46 @@ |
| "test": "chrome_public_test_apk" |
| }, |
| { |
| + "override_compile_targets": [ |
| + "chrome_sync_shell_test_apk" |
| + ], |
| + "override_isolate_target": "chrome_sync_shell_test_apk", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 960 |
| + }, |
| + "test": "chrome_sync_shell_test_apk" |
| + }, |
| + { |
| + "override_isolate_target": "components_browsertests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "components_browsertests" |
| }, |
| { |
| + "override_isolate_target": "components_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "components_unittests" |
| }, |
| { |
| @@ -76,101 +205,383 @@ |
| "device_type": "hammerhead" |
| } |
| ], |
| - "hard_timeout": 1200 |
| + "hard_timeout": 960 |
| }, |
| "test": "content_browsertests" |
| }, |
| { |
| + "override_compile_targets": [ |
| + "content_shell_test_apk" |
| + ], |
| + "override_isolate_target": "content_shell_test_apk", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 960 |
| + }, |
| + "test": "content_shell_test_apk" |
| + }, |
| + { |
| + "override_isolate_target": "content_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "content_unittests" |
| }, |
| { |
| + "override_isolate_target": "device_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "device_unittests" |
| }, |
| { |
| + "override_isolate_target": "events_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "events_unittests" |
| }, |
| { |
| + "override_isolate_target": "gl_tests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "gl_tests" |
| }, |
| { |
| + "override_isolate_target": "gl_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "gl_unittests" |
| }, |
| { |
| + "override_isolate_target": "gpu_ipc_service_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "gpu_ipc_service_unittests" |
| }, |
| { |
| + "override_isolate_target": "gpu_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "gpu_unittests" |
| }, |
| { |
| + "override_isolate_target": "ipc_mojo_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "ipc_mojo_unittests" |
| }, |
| { |
| + "override_isolate_target": "ipc_tests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "ipc_tests" |
| }, |
| { |
| + "override_isolate_target": "media_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "media_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_common_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_common_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_public_application_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_public_application_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_public_bindings_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_public_bindings_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_public_system_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_public_system_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_runner_host_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_runner_host_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_surfaces_lib_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 30 |
| + }, |
| "test": "mojo_surfaces_lib_unittests" |
| }, |
| { |
| + "override_isolate_target": "mojo_system_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 60 |
| + }, |
| "test": "mojo_system_unittests" |
| }, |
| { |
| + "override_isolate_target": "net_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "net_unittests" |
| }, |
| { |
| - "override_compile_targets": [ |
| - "sandbox_linux_unittests" |
| - ], |
| + "override_isolate_target": "sandbox_linux_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "sandbox_linux_unittests" |
| }, |
| { |
| + "override_isolate_target": "sql_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "sql_unittests" |
| }, |
| { |
| + "override_isolate_target": "sync_unit_tests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "sync_unit_tests" |
| }, |
| { |
| + "override_isolate_target": "ui_android_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "ui_android_unittests" |
| }, |
| { |
| + "override_isolate_target": "ui_base_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "ui_base_unittests" |
| }, |
| { |
| + "override_isolate_target": "ui_touch_selection_unittests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "ui_touch_selection_unittests" |
| }, |
| { |
| + "override_isolate_target": "unit_tests", |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ] |
| + }, |
| "test": "unit_tests" |
| } |
| ], |
| - "instrumentation_tests": [ |
| - { |
| - "test": "android_webview_test_apk" |
| - }, |
| - { |
| - "test": "blimp_test_apk" |
| - }, |
| - { |
| - "test": "chrome_sync_shell_test_apk" |
| - }, |
| + "isolated_scripts": [ |
| { |
| - "test": "content_shell_test_apk" |
| + "args": [ |
| + "--browser=android-chromium", |
| + "--device=android" |
| + ], |
| + "isolate_name": "telemetry_perf_unittests", |
| + "name": "telemetry_perf_unittests", |
| + "override_compile_targets": [ |
| + "telemetry_perf_unittests" |
| + ], |
| + "swarming": { |
| + "can_use_on_swarming_builders": true, |
| + "dimension_sets": [ |
| + { |
| + "device_os": "KTU84P", |
| + "device_type": "hammerhead" |
| + } |
| + ], |
| + "hard_timeout": 960 |
| + } |
| } |
| ], |
| "junit_tests": [ |
| @@ -209,10 +620,6 @@ |
| { |
| "name": "webview_licenses", |
| "script": "webview_licenses.py" |
| - }, |
| - { |
| - "name": "telemetry_perf_unittests", |
| - "script": "telemetry_perf_unittests.py" |
| } |
| ] |
| }, |