infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json - Issue 2351243002: Snazzier dump log step on Android bots.

Unified Diff: infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json

Issue 2351243002: Snazzier dump log step on Android bots. (Closed)

Patch Set: Created 4 years, 3 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

« no previous file with comments | « infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android.json ('k') | infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json

diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json

index 09ee255aee47f74fa40fa3e32d97c75571fe19fc..391678e2374d706ed7b613eb40c83ff82eb2cf6d 100644

--- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json

+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android.json

@@ -468,12 +468,30 @@

{

"cmd": [

- "adb",

- "logcat",

- "-d"

+ "python",

+ "-u",

+ "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",

+ "[SLAVE_BUILD]/out/Release"

- "cwd": "[SLAVE_BUILD]/skia",

- "name": "dump log"

+ "name": "dump log",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@import os@@@",

+ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",

+ "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@",

+ "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@",

+ "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@",

+ "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@",

+ "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@",

+ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@",

+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@",

+ "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print line@@@",

+ "@@@STEP_LOG_END@python.inline@@@"

+ ]

{

"cmd": [