| Index: scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json
|
| diff --git a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json
|
| index c82d4a2089d55cca1c69fec82caf567fd6d05636..505eb3a623b187f5a8ddcc22b25abe9ddfd564b2 100644
|
| --- a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json
|
| +++ b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json
|
| @@ -123,12 +123,40 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py"
|
| + "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
|
| + "--json-output",
|
| + "/path/to/tmp/json"
|
| ],
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| - "name": "device_status_check"
|
| + "name": "device_status_check",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build\": \"LRX21O\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"type\": \"flo\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -161,23 +189,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/recipe_modules/adb/resources/list_devices.py",
|
| - "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "List adb devices",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@[@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C010\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@]@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "[SLAVE_BUILD]/src/tools/perf/run_benchmark",
|
| "list",
|
| "--browser",
|
| @@ -187,7 +198,7 @@
|
| "--num-shards",
|
| "1",
|
| "--device",
|
| - "014E1F310401C009"
|
| + "07a00ca4"
|
| ],
|
| "name": "List Perf Tests",
|
| "~followup_annotations": [
|
|
|