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

Fixes for Reader/Gmail/Photos

Browse Source 
Check in missing UiAutomation .class files
Fix generation and deletion of dump sys logs including renaming to a standard [test tag]_[test number].log format
Improved Reader to run across a range of devices with subtlety different layouts and views
This commit is contained in:
James Hartley
2016-05-05 11:05:06 +01:00
parent 4dce709cd1
commit d77b29165f
15 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wlauto/workloads/reader/__init__.py
View File

@@ -65,21 +65,20 @@ class Reader(AndroidUiAutoBenchmark):
def update_result(self, context):
super(Reader, self).update_result(context)
if self.dumpsys_enabled:
self.device.pull_file(self.output_file, context.output_directory)
result_file = os.path.join(context.output_directory, self.instrumentation_log)
self.device.pull_file(self.output_file, context.output_directory)
result_file = os.path.join(context.output_directory, self.instrumentation_log)
with open(result_file, 'r') as wfh:
regex = re.compile(r'(?P<key>\w+)\s+(?P<value1>\d+)\s+(?P<value2>\d+)\s+(?P<value3>\d+)')
for line in wfh:
match = regex.search(line)
if match:
context.result.add_metric((match.group('key') + "_start"),
match.group('value1'))
context.result.add_metric((match.group('key') + "_finish"),
match.group('value2'))
context.result.add_metric((match.group('key') + "_duration"),
match.group('value3'))
with open(result_file, 'r') as wfh:
regex = re.compile(r'(?P<key>\w+)\s+(?P<value1>\d+)\s+(?P<value2>\d+)\s+(?P<value3>\d+)')
for line in wfh:
match = regex.search(line)
if match:
context.result.add_metric((match.group('key') + "_start"),
match.group('value1'))
context.result.add_metric((match.group('key') + "_finish"),
match.group('value2'))
context.result.add_metric((match.group('key') + "_duration"),
match.group('value3'))
def teardown(self, context):
super(Reader, self).teardown(context)
@@ -88,6 +87,6 @@ class Reader(AndroidUiAutoBenchmark):
self.device.delete_file(os.path.join(self.reader_local_dir, file))
for file in self.device.listdir(self.device.working_directory):
if file.startswith (self.name) and file.endswith(".log"):
if file.endswith(".log"):
self.device.pull_file(os.path.join(self.device.working_directory, file), context.output_directory)
self.device.delete_file(os.path.join(self.device.working_directory, file))

BIN
wlauto/workloads/reader/com.arm.wlauto.uiauto.reader.jar
View File

Binary file not shown.

2
wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@@ -227,7 +227,7 @@ public class UiAutomation extends UxPerfUiAutomation {
int percent = pair.getValue().percent;
String runName = String.format(TestTag + "_" + pair.getKey());
String gfxInfologName = String.format(TAG + "_" + runName + "_gfxInfo.log");
String gfxInfologName = String.format(runName + "_gfxInfo.log");
String surfFlingerlogName = String.format(runName + "_surfFlinger.log");
String viewName = new String("com.adobe.reader.viewer.ARViewerActivity");