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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.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
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json
index 15be1ecb804b4274834185d7884583fe47e1cf52..0fc6032119471ffc14c410c2ee2b41d1ecc00cd8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.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",
kjellander_chromium 2016/04/05 19:24:58 This doesn't work for WebRTC since this script doe
"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"

Powered by Google App Engine
This is Rietveld 408576698