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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.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/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json ('K') | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_android32_asan__l_nexus6_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json

diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json

index 310647b4104c748c55a6a08dc811ea98cdd502cb..7e0bf7948e5ca8d8ad4c540860535d01e8aa27e3 100644

--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json

+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json

@@ -634,35 +634,15 @@

{

"cmd": [

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

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

- },

- {

- "cmd": [

"python",

"-u",

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

+ "[SLAVE_BUILD]/src/out/Release/bin/run_AppRTCDemoTest",

"instrumentation",

- "--test-apk",

- "[SLAVE_BUILD]/src/out/Release/apks/AppRTCDemoTest.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/AppRTCDemo.apk",

- "--verbose",

- "--release"

+ "--verbose"

"cwd": "[SLAVE_BUILD]",

"name": "Instrumentation test AppRTCDemoTest"

@@ -671,16 +651,13 @@

"cmd": [

"python",

"-u",

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

+ "[SLAVE_BUILD]/src/out/Release/bin/run_libjingle_peerconnection_android_unittest",

"instrumentation",

- "--test-apk",

- "[SLAVE_BUILD]/src/out/Release/apks/libjingle_peerconnection_android_unittest.apk",

"--blacklist-file",

"[SLAVE_BUILD]/src/out/bad_devices.json",

"--logcat-output-file",

"/path/to/tmp/",

- "--verbose",

- "--release"

+ "--verbose"

"cwd": "[SLAVE_BUILD]",

"name": "Instrumentation test libjingle_peerconnection_android_unittest"