sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-02 11:22:41 +01:00
Code Issues Releases Wiki Activity

glbench: Fixed updated logcat format

Browse Source 
The old results looked like:
I/TfwActivity(30824):    "description": "",
I/TfwActivity(30824):    "elapsed_time": 62070,
I/TfwActivity(30824):    "error": "NOERROR",

The new format is:
04-04 11:38:04.144  1410  1410 I TfwActivity:    "description": "",
04-04 11:38:04.144  1410  1410 I TfwActivity:    "elapsed_time": 62009,
04-04 11:38:04.144  1410  1410 I TfwActivity:    "error": "NOERROR",
This commit is contained in:
Sebastian Goscik
2016-04-04 17:33:48 +01:00
parent 712c79020d
commit 9a301175b0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wlauto/workloads/glbcorp/__init__.py
View File

@@ -29,6 +29,10 @@ from wlauto.exceptions import WorkloadError
DELAY = 2 DELAY = 2
OLD_RESULT_START_REGEX = re.compile(r'I/TfwActivity\s*\(\s*\d+\):\s+\S+\s+result: {')
NEW_RESULT_START_REGEX = re.compile(r'[\d\s:.-]+I\sTfwActivity(\s*\(\s*\d+\))?:\s+\S+\s+result: {')
OLD_PREAMBLE_REGEX = re.compile(r'I/TfwActivity\s*\(\s*\d+\):\s+')
NEW_PREAMBLE_REGEX = re.compile(r'[\d\s:.-]+I\sTfwActivity(\s*\(\s*\d+\))?:')
class GlbCorp(ApkWorkload): class GlbCorp(ApkWorkload):
@@ -44,8 +48,8 @@ class GlbCorp(ApkWorkload):
package = 'net.kishonti.gfxbench' package = 'net.kishonti.gfxbench'
activity = 'net.kishonti.benchui.TestActivity' activity = 'net.kishonti.benchui.TestActivity'
result_start_regex = re.compile(r'I/TfwActivity\s*\(\s*\d+\):\s+\S+\s+result: {') result_start_regex = None
preamble_regex = re.compile(r'I/TfwActivity\s*\(\s*\d+\):\s+') preamble_regex = None
valid_test_ids = [ valid_test_ids = [
'gl_alu', 'gl_alu',
@@ -131,7 +135,14 @@ class GlbCorp(ApkWorkload):
line = fh.next() line = fh.next()
result_lines = [] result_lines = []
while True: while True:
if self.result_start_regex.search(line): if OLD_RESULT_START_REGEX.search(line):
self.preamble_regex = OLD_PREAMBLE_REGEX
self.result_start_regex = OLD_RESULT_START_REGEX
elif NEW_RESULT_START_REGEX.search(line):
self.preamble_regex = NEW_PREAMBLE_REGEX
self.result_start_regex = NEW_RESULT_START_REGEX
if self.result_start_regex and self.result_start_regex.search(line):
result_lines.append('{') result_lines.append('{')
line = fh.next() line = fh.next()
while self.preamble_regex.search(line): while self.preamble_regex.search(line):
@@ -212,4 +223,3 @@ class GlbRunMonitor(threading.Thread):
def wait_for_run_end(self, timeout): def wait_for_run_end(self, timeout):
self.run_ended.wait(timeout) self.run_ended.wait(timeout)
self.run_ended.clear() self.run_ended.clear()