diff options
| author | scott <scott.jackson@arm.com> | 2018-11-15 15:24:12 +0000 |
|---|---|---|
| committer | Marc Bonnici <marc.bonnici@arm.com> | 2018-11-15 15:56:09 +0000 |
| commit | 3bd8f033d57775924a6ddc8a591c616355263b7f (patch) | |
| tree | 66a547b4d578ddc8111252c6473264da20bba184 | |
| parent | ea1d4e907110526e0bf205f319d7710fcc5e3e7a (diff) | |
workloads: Updating geekbench to support v4.3.1
v4.3.1 has made a minor change to the run cpu benchmark element.
Refactoring to support both the new and previous elements.
| -rw-r--r-- | wa/workloads/geekbench/__init__.py | 4 | ||||
| -rw-r--r-- | wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk | bin | 264787 -> 264738 bytes | |||
| -rw-r--r-- | wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/wa/workloads/geekbench/__init__.py b/wa/workloads/geekbench/__init__.py index 14484d97..724c6074 100644 --- a/wa/workloads/geekbench/__init__.py +++ b/wa/workloads/geekbench/__init__.py @@ -52,6 +52,10 @@ class Geekbench(ApkUiautoWorkload): """ summary_metrics = ['score', 'multicore_score'] versions = { + '4.3.1': { + 'package': 'com.primatelabs.geekbench', + 'activity': '.HomeActivity', + }, '4.2.0': { 'package': 'com.primatelabs.geekbench', 'activity': '.HomeActivity', diff --git a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk Binary files differindex 389e6b43..3e44831a 100644 --- a/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk +++ b/wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk diff --git a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java index ac9431fe..f7f20ce5 100644 --- a/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java +++ b/wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java @@ -126,7 +126,7 @@ public class UiAutomation extends BaseUiAutomation { public void runBenchmarks() throws Exception { UiObject runButton = - mDevice.findObject(new UiSelector().textContains("Run Benchmarks") + mDevice.findObject(new UiSelector().textContains("Run Benchmark") .className("android.widget.Button")); if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) { throw new UiObjectNotFoundException("Could not find Run button"); |