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

Merge pull request #142 from ep1cman/master

Browse Source 
glbench updates
This commit is contained in:
setrofim
2016-04-14 16:41:26 +01:00
parent f5e138bed0 73aa590056
commit 0bfa4bff3c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ class GlbCorp(ApkWorkload):
self.monitor = GlbRunMonitor(self.device)
self.monitor.start()
def start_activity(self):
def launch_package(self):
# Unlike with most other APK workloads, we're invoking the use case
# directly by starting the activity with appropriate parameters on the
# command line during execution, so we dont' need to start activity
@@ -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):