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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.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: Created 4 years, 9 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
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json ('k') | scripts/slave/recipes/chromium_trybot.expected/amp_test_failure.json » ('j') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
index 99e2de55148feec8834119bb1e575fd3a7ee2f9a..14870c767c485c7d12e48b1d0ffcb8161415f209 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
@@ -476,178 +476,88 @@
},
{
"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",
+ "out/Release/bin/run_android_webview_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.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"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test AndroidWebViewTest",
+ "name": "Instrumentation test android_webview_test_apk",
"~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",
+ "out/Release/bin/run_chrome_public_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ChromePublicTest.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"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromePublicTest",
+ "name": "Instrumentation test chrome_public_test_apk",
"~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",
+ "out/Release/bin/run_chrome_sync_shell_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ChromeSyncShellTest.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"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ChromeSyncShellTest",
+ "name": "Instrumentation test chrome_sync_shell_test_apk",
"~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",
+ "out/Release/bin/run_content_shell_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/ContentShellTest.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"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test ContentShellTest",
+ "name": "Instrumentation test content_shell_test_apk",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
@@ -656,10 +566,8 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "out/Release/bin/run_mojo_test_apk",
"instrumentation",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/MojoTest.apk",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--logcat-output-file",
@@ -667,12 +575,11 @@
"--flakiness-dashboard-server",
"test-results.appspot.com",
"--verbose",
- "--release",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Instrumentation test MojoTest",
+ "name": "Instrumentation test mojo_test_apk",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>failures:<br/>TestB<br/>@@@"
]
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json ('k') | scripts/slave/recipes/chromium_trybot.expected/amp_test_failure.json » ('j') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698