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

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json

Issue 2486923002: Use devil's adb with each bisect iteration, also start/stop daemons. (Closed)
Patch Set: Address jbudorick's comments. Created 4 years, 1 month 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/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json
index 662408f266bff152bad6abb87b850ea600b7d85f..f4876f15c698ee2564e79f7ad53241f1422c7f7c 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_nexus5_perf_bisect.json
@@ -215,7 +215,7 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",
+ "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\nfrom devil.android.sdk import adb_wrapper\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\nadb_wrapper.AdbWrapper.StartServer()\n",
"[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil"
],
"name": "initialize devil",
@@ -224,8 +224,10 @@
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
"@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
+ "@@@STEP_LOG_LINE@python.inline@from devil.android.sdk import adb_wrapper@@@",
"@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
"@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@adb_wrapper.AdbWrapper.StartServer()@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},

Powered by Google App Engine
This is Rietveld 408576698