| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Cloud_Tests.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Cloud_Tests.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Cloud_Tests.json
|
| index fd6cbd42895f644d5b1476ea596f87fbcbc25965..3fe600dfdb86b822ab15d5207955a9422cd7581e 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Cloud_Tests.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Cloud_Tests.json
|
| @@ -206,10 +206,14 @@
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| "--",
|
| + "android_webview_test_apk",
|
| "base_junit_tests",
|
| "chrome_junit_tests",
|
| + "chrome_public_test_apk",
|
| + "chrome_sync_shell_test_apk",
|
| "components_junit_tests",
|
| "content_junit_tests",
|
| + "content_shell_test_apk",
|
| "junit_unit_tests",
|
| "net_junit_tests"
|
| ],
|
| @@ -231,7 +235,7 @@
|
| "TestSlavename",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--n",
|
| - "6",
|
| + "10",
|
| "launch",
|
| "--snapshot",
|
| "clean-19-l-phone-snapshot"
|
| @@ -273,6 +277,176 @@
|
| },
|
| {
|
| "cmd": [
|
| + "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
|
| + "-v",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--release"
|
| + ],
|
| + "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/Release/apks/AndroidWebViewTest.apk",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--apk-under-test",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
|
| + "--isolate-file-path",
|
| + "android_webview/android_webview_test_apk.isolate",
|
| + "--flakiness-dashboard-server",
|
| + "test-results.appspot.com",
|
| + "--verbose",
|
| + "--release",
|
| + "--json-results-file",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Instrumentation test AndroidWebViewTest",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
|
| + "-v",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--release"
|
| + ],
|
| + "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/Release/apks/ChromePublicTest.apk",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--apk-under-test",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk",
|
| + "--additional-apk",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTestSupport.apk",
|
| + "--additional-apk",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromiumNetTestSupport.apk",
|
| + "--isolate-file-path",
|
| + "chrome/chrome_public_test_apk.isolate",
|
| + "--flakiness-dashboard-server",
|
| + "test-results.appspot.com",
|
| + "--verbose",
|
| + "--release",
|
| + "--json-results-file",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Instrumentation test ChromePublicTest",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
|
| + "-v",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--release"
|
| + ],
|
| + "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/Release/apks/ContentShellTest.apk",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--apk-under-test",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ContentShell.apk",
|
| + "--isolate-file-path",
|
| + "content/content_shell_test_apk.isolate",
|
| + "--flakiness-dashboard-server",
|
| + "test-results.appspot.com",
|
| + "--verbose",
|
| + "--release",
|
| + "--json-results-file",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Instrumentation test ContentShellTest",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
|
| + "-v",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--release"
|
| + ],
|
| + "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/Release/apks/ChromeSyncShellTest.apk",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--apk-under-test",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShell.apk",
|
| + "--flakiness-dashboard-server",
|
| + "test-results.appspot.com",
|
| + "--verbose",
|
| + "--release",
|
| + "--json-results-file",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Instrumentation test ChromeSyncShellTest",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| "python",
|
| "-u",
|
| "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| @@ -451,7 +625,7 @@
|
| "TestSlavename",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--n",
|
| - "6",
|
| + "10",
|
| "shutdown"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
|
|