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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json

Issue 1879283002: 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/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 09d883662c1414a3e94da8c3d563bfc918af220a..13e93a10a935da3f858a539f6acd7ffd557ca14c 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
@@ -573,10 +573,14 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "breakpad_unittests",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
+ "--release",
"--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
@@ -584,6 +588,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "breakpad_unittests"
@@ -592,16 +597,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_unittests",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "sandbox_linux_unittests",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
+ "--release",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "sandbox_linux_unittests"

Powered by Google App Engine
This is Rietveld 408576698