scripts/slave/recipes/cronet.expected/android_cronet_tester.json - Issue 1855663002: Make android's run_instrumentation_suite() use generated wrapper scripts

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_tester.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: Fix wrapper script return value 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

« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json ('k') | scripts/slave/recipes/cronet.expected/cronet_try.json » ('j') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/cronet.expected/android_cronet_tester.json

diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_tester.json b/scripts/slave/recipes/cronet.expected/android_cronet_tester.json

index e848e0b03e14e934ba3af74f7f9dd262f1b2bdab..45503aac72babce7de8dab5e0d48dc2bb4636ca7 100644

--- a/scripts/slave/recipes/cronet.expected/android_cronet_tester.json

+++ b/scripts/slave/recipes/cronet.expected/android_cronet_tester.json

@@ -457,79 +457,37 @@

{

"cmd": [

- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

- "[SLAVE_BUILD]/src/out/Debug/apks/CronetSample.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 CronetSample.apk"

- },

- {

- "cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_sample_test_apk",

"instrumentation",

- "--test-apk",

- "[SLAVE_BUILD]/src/out/Debug/apks/CronetSampleTest.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/CronetSample.apk",

- "--additional-apk",

- "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",

"--verbose",

"--num-retries",

"0"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test CronetSampleTest"

- },

- {

- "cmd": [

- "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

- "[SLAVE_BUILD]/src/out/Debug/apks/CronetTest.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 CronetTest.apk"

+ "name": "Instrumentation test cronet_sample_test_apk"

{

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_test_instrumentation_apk",

"instrumentation",

- "--test-apk",

- "[SLAVE_BUILD]/src/out/Debug/apks/CronetTestInstrumentation.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/CronetTest.apk",

- "--additional-apk",

- "[SLAVE_BUILD]/src/out/Debug/apks/ChromiumNetTestSupport.apk",

- "--isolate-file-path",

- "components/cronet/android/cronet_test_instrumentation_apk.isolate",

"--verbose",

"--num-retries",

"0"

"cwd": "[SLAVE_BUILD]",

- "name": "Instrumentation test CronetTestInstrumentation"

+ "name": "Instrumentation test cronet_test_instrumentation_apk"

{

"cmd": [