| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
|
| index f892384656c2a029db18c12af713b22e32553da8..dc2195b549dda9042a6609ebf11250d4f1e0a670 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
|
| @@ -582,34 +582,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install AndroidWebView.apk"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebViewTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_android_webview_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
|
| - "--isolate-file-path",
|
| - "android_webview/android_webview_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -626,38 +605,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ChromePublic.apk"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_public_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
|
| - "--additional-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTestSupport.apk",
|
| - "--additional-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",
|
| - "--isolate-file-path",
|
| - "chrome/chrome_public_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -674,34 +628,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ContentShell.apk"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShellTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_content_shell_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
|
| - "--isolate-file-path",
|
| - "content/content_shell_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -718,32 +651,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ChromeSyncShell.apk"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShellTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -1078,34 +992,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install AndroidWebView.apk (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebViewTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_android_webview_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/AndroidWebView.apk",
|
| - "--isolate-file-path",
|
| - "android_webview/android_webview_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -1122,38 +1015,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ChromePublic.apk (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_public_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublic.apk",
|
| - "--additional-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromePublicTestSupport.apk",
|
| - "--additional-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",
|
| - "--isolate-file-path",
|
| - "chrome/chrome_public_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -1170,34 +1038,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ContentShell.apk (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShellTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_content_shell_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ContentShell.apk",
|
| - "--isolate-file-path",
|
| - "content/content_shell_test_apk.isolate",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
| @@ -1214,32 +1061,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
|
| - "-v",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "install ChromeSyncShell.apk (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShellTest.apk",
|
| + "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--logcat-output-file",
|
| "/path/to/tmp/",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Debug/apks/ChromeSyncShell.apk",
|
| "--flakiness-dashboard-server",
|
| "test-results.appspot.com",
|
| "--verbose",
|
|
|