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

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json

Issue 2122313002: Move known_devices file to ~/.android (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: with expectations Created 4 years, 5 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/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
index 2c065cc03c8f1389abe566c19b7cd75f2539bf3b..2b2ef543ece2923e68bec53fd68d574ebb20a667 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/perf_runner_disable_location_basic.json
@@ -278,7 +278,7 @@
"--json-output",
"/path/to/tmp/json",
"--known-devices-file",
- "[CACHE]/known_android_devices"
+ "[HOME]/.android/known_devices.json"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -401,6 +401,24 @@
"name": "provision_devices"
},
{
+ "cmd": [],
+ "name": "fix_device_file_format"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[HOME]/.android/known_devices.json",
+ "/path/to/tmp/"
+ ],
+ "name": "fix_device_file_format.read_device_file",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@file format is compatible@@@"
+ ]
+ },
+ {
"cmd": [
"[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
"--adb-path",
@@ -410,7 +428,7 @@
"--json-output",
"/path/to/tmp/json",
"--known-devices-file",
- "[CACHE]/known_android_devices"
+ "[HOME]/.android/known_devices.json"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

Powered by Google App Engine
This is Rietveld 408576698