summaryrefslogtreecommitdiffstats
path: root/scripts/lib/resulttool/resultutils.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-26 21:56:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-27 10:22:31 +0100
commitf08831c5a977ec5ba0ef1338abd990901dc160a7 (patch)
treed682a126cf0f8b026124ddbebd65d2521dda873b /scripts/lib/resulttool/resultutils.py
parent7a6739398a4a0760c6ae7aa90f91ffac89309e05 (diff)
downloadpoky-f08831c5a977ec5ba0ef1338abd990901dc160a7.tar.gz
resulttool/log: Add ability to dump ltp logs as well as ptest
Currently only ptest logs are accessible with the log command, this adds support so the ltp logs can be extracted too. (From OE-Core rev: 64a2121a875ce128959ee0a62e310d5f91f87b0d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/resulttool/resultutils.py')
-rw-r--r--scripts/lib/resulttool/resultutils.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py
index 5fec01f6f3..8917022d36 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -130,23 +130,29 @@ def decode_log(logdata):
130 return data.decode("utf-8", errors='ignore') 130 return data.decode("utf-8", errors='ignore')
131 return None 131 return None
132 132
133def ptestresult_get_log(results, section): 133def generic_get_log(sectionname, results, section):
134 if 'ptestresult.sections' not in results: 134 if sectionname not in results:
135 return None 135 return None
136 if section not in results['ptestresult.sections']: 136 if section not in results[sectionname]:
137 return None 137 return None
138 138
139 ptest = results['ptestresult.sections'][section] 139 ptest = results[sectionname][section]
140 if 'log' not in ptest: 140 if 'log' not in ptest:
141 return None 141 return None
142 return decode_log(ptest['log']) 142 return decode_log(ptest['log'])
143 143
144def ptestresult_get_rawlogs(results): 144def ptestresult_get_log(results, section):
145 if 'ptestresult.rawlogs' not in results: 145 return generic_get_log('ptestresuls.sections', results, section)
146
147def generic_get_rawlogs(sectname, results):
148 if sectname not in results:
146 return None 149 return None
147 if 'log' not in results['ptestresult.rawlogs']: 150 if 'log' not in results[sectname]:
148 return None 151 return None
149 return decode_log(results['ptestresult.rawlogs']['log']) 152 return decode_log(results[sectname]['log'])
153
154def ptestresult_get_rawlogs(results):
155 return generic_get_rawlogs('ptestresult.rawlogs', results)
150 156
151def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False): 157def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False):
152 for res in results: 158 for res in results: