Index: testing/buildbot/chromium.linux.json |
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json |
index c502063bb26642942d467f3864a468f75123d3c8..d2fff233c65b5825a47a29f1d3970017de023d64 100644 |
--- a/testing/buildbot/chromium.linux.json |
+++ b/testing/buildbot/chromium.linux.json |
@@ -22,50 +22,6 @@ |
}, |
"Android Tests": { |
"gtest_tests": [ |
- { |
- "merge": { |
- "args": [ |
- "--bucket", |
- "chromium-result-details", |
- "--test-name", |
- "android_webview_test_apk" |
- ], |
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py" |
- }, |
- "override_compile_targets": [ |
- "android_webview_test_apk" |
- ], |
- "override_isolate_target": "android_webview_test_apk", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "cipd_packages": [ |
- { |
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}", |
- "location": "bin", |
- "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" |
- } |
- ], |
- "dimension_sets": [ |
- { |
- "android_devices": "6", |
- "device_os": "KTU84P", |
- "device_type": "hammerhead" |
- } |
- ], |
- "hard_timeout": 960, |
- "output_links": [ |
- { |
- "link": [ |
- "https://luci-logdog.appspot.com/v/?s", |
- "=android%2Fswarming%2Flogcats%2F", |
- "${TASK_ID}%2F%2B%2Funified_logcats" |
- ], |
- "name": "shard #${SHARD_INDEX} logcats" |
- } |
- ] |
- }, |
- "test": "android_webview_test_apk" |
- }, |
{ |
"merge": { |
"args": [ |
@@ -1470,6 +1426,50 @@ |
] |
}, |
"test": "unit_tests" |
+ }, |
+ { |
+ "merge": { |
+ "args": [ |
+ "--bucket", |
+ "chromium-result-details", |
+ "--test-name", |
+ "webview_instrumentation_test_apk" |
+ ], |
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py" |
+ }, |
+ "override_compile_targets": [ |
+ "webview_instrumentation_test_apk" |
+ ], |
+ "override_isolate_target": "webview_instrumentation_test_apk", |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "cipd_packages": [ |
+ { |
+ "cipd_package": "infra/tools/luci/logdog/butler/${platform}", |
+ "location": "bin", |
+ "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" |
+ } |
+ ], |
+ "dimension_sets": [ |
+ { |
+ "android_devices": "6", |
+ "device_os": "KTU84P", |
+ "device_type": "hammerhead" |
+ } |
+ ], |
+ "hard_timeout": 960, |
+ "output_links": [ |
+ { |
+ "link": [ |
+ "https://luci-logdog.appspot.com/v/?s", |
+ "=android%2Fswarming%2Flogcats%2F", |
+ "${TASK_ID}%2F%2B%2Funified_logcats" |
+ ], |
+ "name": "shard #${SHARD_INDEX} logcats" |
+ } |
+ ] |
+ }, |
+ "test": "webview_instrumentation_test_apk" |
} |
], |
"isolated_scripts": [ |
@@ -1545,50 +1545,6 @@ |
}, |
"Android Tests (dbg)": { |
"gtest_tests": [ |
- { |
- "merge": { |
- "args": [ |
- "--bucket", |
- "chromium-result-details", |
- "--test-name", |
- "android_webview_test_apk" |
- ], |
- "script": "//build/android/pylib/results/presentation/test_results_presentation.py" |
- }, |
- "override_compile_targets": [ |
- "android_webview_test_apk" |
- ], |
- "override_isolate_target": "android_webview_test_apk", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "cipd_packages": [ |
- { |
- "cipd_package": "infra/tools/luci/logdog/butler/${platform}", |
- "location": "bin", |
- "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" |
- } |
- ], |
- "dimension_sets": [ |
- { |
- "android_devices": "6", |
- "device_os": "KTU84P", |
- "device_type": "hammerhead" |
- } |
- ], |
- "hard_timeout": 960, |
- "output_links": [ |
- { |
- "link": [ |
- "https://luci-logdog.appspot.com/v/?s", |
- "=android%2Fswarming%2Flogcats%2F", |
- "${TASK_ID}%2F%2B%2Funified_logcats" |
- ], |
- "name": "shard #${SHARD_INDEX} logcats" |
- } |
- ] |
- }, |
- "test": "android_webview_test_apk" |
- }, |
{ |
"merge": { |
"args": [ |
@@ -3025,6 +2981,50 @@ |
] |
}, |
"test": "unit_tests" |
+ }, |
+ { |
+ "merge": { |
+ "args": [ |
+ "--bucket", |
+ "chromium-result-details", |
+ "--test-name", |
+ "webview_instrumentation_test_apk" |
+ ], |
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py" |
+ }, |
+ "override_compile_targets": [ |
+ "webview_instrumentation_test_apk" |
+ ], |
+ "override_isolate_target": "webview_instrumentation_test_apk", |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "cipd_packages": [ |
+ { |
+ "cipd_package": "infra/tools/luci/logdog/butler/${platform}", |
+ "location": "bin", |
+ "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c" |
+ } |
+ ], |
+ "dimension_sets": [ |
+ { |
+ "android_devices": "6", |
+ "device_os": "KTU84P", |
+ "device_type": "hammerhead" |
+ } |
+ ], |
+ "hard_timeout": 960, |
+ "output_links": [ |
+ { |
+ "link": [ |
+ "https://luci-logdog.appspot.com/v/?s", |
+ "=android%2Fswarming%2Flogcats%2F", |
+ "${TASK_ID}%2F%2B%2Funified_logcats" |
+ ], |
+ "name": "shard #${SHARD_INDEX} logcats" |
+ } |
+ ] |
+ }, |
+ "test": "webview_instrumentation_test_apk" |
} |
], |
"isolated_scripts": [ |