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

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_tester.json

Issue 1902983002: Revert of Switch Android gtests to use generated wrapper scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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/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 9867fc2461b81f9252aa81667bcee3e25e7097e4..9f0aa1b0367c686e1ffbbb5fb4da0deb4052f534 100644
--- a/scripts/slave/recipes/cronet.expected/android_cronet_tester.json
+++ b/scripts/slave/recipes/cronet.expected/android_cronet_tester.json
@@ -421,7 +421,10 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_unittests",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "cronet_unittests",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
@@ -430,6 +433,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "cronet_unittests"
@@ -438,7 +442,10 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_net_unittests",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "net_unittests",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
@@ -447,6 +454,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "net_unittests"

Powered by Google App Engine
This is Rietveld 408576698