1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-20 11:58:55 +00:00

glbench: Fixed ending regex

Updated the regex that detected the end of the benchmark to match the new
logcat format.
This commit is contained in:
Sebastian Goscik 2016-04-14 16:33:06 +01:00
parent f5e138bed0
commit 985b249a24

View File

@ -188,8 +188,8 @@ class GlbCorp(ApkWorkload):
class GlbRunMonitor(threading.Thread):
regex = re.compile(r'I/Runner\s+\(\s*\d+\): finished:')
old_regex = re.compile(r'I/Runner\s+\(\s*\d+\): finished:')
new_regex = re.compile(r'I Runner\s*:\s*finished:')
def __init__(self, device):
super(GlbRunMonitor, self).__init__()
self.device = device
@ -213,7 +213,7 @@ class GlbRunMonitor(threading.Thread):
ready, _, _ = select.select([proc.stdout, proc.stderr], [], [], 2)
if ready:
line = ready[0].readline()
if self.regex.search(line):
if self.new_regex.search(line) or self.old_regex.search(line):
self.run_ended.set()
def stop(self):