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

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

Issue 2402303003: Enable new device monitor everywhere and launch it earlier in the build. (Closed)
Patch Set: With expectations Created 4 years, 2 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/dynamic_gtest_asan_android.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_gtest_asan_android.json b/scripts/slave/recipes/chromium.expected/dynamic_gtest_asan_android.json
index 88cf84d11e9c3dd9c64165f527ae961c6dcf2bf6..5a8f1c3856509e0f712965ff210f50c983f11cd2 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_gtest_asan_android.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_gtest_asan_android.json
@@ -326,6 +326,29 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--action",
+ "restart",
+ "--pid-file-path",
+ "/tmp/device_monitor.pid",
+ "--",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "LLVM_FORCE_HEAD_REVISION": "YES",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "spawn_device_monitor"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
@@ -589,29 +612,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
- "--action",
- "restart",
- "--pid-file-path",
- "/tmp/device_monitor.pid",
- "--",
- "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
- "[\"07a00ca4\"]",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "LLVM_FORCE_HEAD_REVISION": "YES",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "spawn_device_monitor"
- },
- {
- "cmd": [
- "python",
- "-u",
"[SLAVE_BUILD]/src/out/Debug/bin/run_gfx_unittests",
"--tool=asan",
"--blacklist-file",

Powered by Google App Engine
This is Rietveld 408576698