diff options
Diffstat (limited to 'scripts/lib/resulttool/resultutils.py')
-rw-r--r-- | scripts/lib/resulttool/resultutils.py | 22 |
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 | ||
133 | def ptestresult_get_log(results, section): | 133 | def 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 | ||
144 | def ptestresult_get_rawlogs(results): | 144 | def ptestresult_get_log(results, section): |
145 | if 'ptestresult.rawlogs' not in results: | 145 | return generic_get_log('ptestresuls.sections', results, section) |
146 | |||
147 | def 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 | |||
154 | def ptestresult_get_rawlogs(results): | ||
155 | return generic_get_rawlogs('ptestresult.rawlogs', results) | ||
150 | 156 | ||
151 | def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False): | 157 | def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False): |
152 | for res in results: | 158 | for res in results: |