Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json

Issue 1855663002: Make android's run_instrumentation_suite() use generated wrapper scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@wrapper-1
Patch Set: coverage :( Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json b/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json
index b67eca08fc8c4e7d3dd1260dd88eb46cffd56764..795170f62008deff4e5fcd91da872076b95c510d 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/amp_test_local_fallback.json
@@ -1334,39 +1334,16 @@
},
{
"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",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -1378,39 +1355,16 @@
},
{
"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",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -1422,43 +1376,16 @@
},
{
"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",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -1470,37 +1397,16 @@
},
{
"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",
+ "[SLAVE_BUILD]/src/out/Release/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/Release/apks/ChromeSyncShell.apk",
"--flakiness-dashboard-server",
"test-results.appspot.com",
"--verbose",
- "--release",
"--json-results-file",
"/path/to/tmp/json"
],
@@ -2563,39 +2469,16 @@
},
{
"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 (2)"
- },
- {
- "cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -2607,39 +2490,16 @@
},
{
"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 (2)"
- },
- {
- "cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.apk",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -2651,43 +2511,16 @@
},
{
"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 (2)"
- },
- {
- "cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.apk",
+ "[SLAVE_BUILD]/src/out/Release/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/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"
],
@@ -2699,37 +2532,16 @@
},
{
"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 (2)"
- },
- {
- "cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.apk",
+ "[SLAVE_BUILD]/src/out/Release/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/Release/apks/ChromeSyncShell.apk",
"--flakiness-dashboard-server",
"test-results.appspot.com",
"--verbose",
- "--release",
"--json-results-file",
"/path/to/tmp/json"
],

Powered by Google App Engine
This is Rietveld 408576698