diff --git a/wlauto/workloads/glbenchmark/__init__.py b/wlauto/workloads/glbenchmark/__init__.py index d8206cc2..0e54e149 100644 --- a/wlauto/workloads/glbenchmark/__init__.py +++ b/wlauto/workloads/glbenchmark/__init__.py @@ -57,14 +57,14 @@ class Glb(AndroidUiAutoBenchmark): view = 'com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBRender' packages = { - '2.7.0': 'com.glbenchmark.glbenchmark27', - '2.5.1': 'com.glbenchmark.glbenchmark25', + '2.7': 'com.glbenchmark.glbenchmark27', + '2.5': 'com.glbenchmark.glbenchmark25', } # If usecase is not specified the default usecase is the first supported usecase alias # for the specified version. supported_usecase_aliases = { - '2.7.0': ['t-rex', 'egypt'], - '2.5.1': ['egypt-classic', 'egypt'], + '2.7': ['t-rex', 'egypt'], + '2.5': ['egypt-classic', 'egypt'], } default_iterations = 1 @@ -73,15 +73,15 @@ class Glb(AndroidUiAutoBenchmark): regex = re.compile(r'GLBenchmark (metric|FPS): (.*)') parameters = [ - Parameter('version', default='2.7.0', allowed_values=['2.7.0', '2.5.1'], + Parameter('version', default='2.7', allowed_values=['2.7', '2.5'], description=('Specifies which version of the benchmark to run (different versions ' 'support different use cases).')), Parameter('use_case', default=None, description="""Specifies which usecase to run, as listed in the benchmark menu; e.g. ``'GLBenchmark 2.5 Egypt HD'``. For convenience, two aliases are provided for the most common use cases: ``'egypt'`` and ``'t-rex'``. These could - be use instead of the full use case title. For version ``'2.7.0'`` it defaults - to ``'t-rex'``, for version ``'2.5.1'`` it defaults to ``'egypt-classic'``. + be use instead of the full use case title. For version ``'2.7'`` it defaults + to ``'t-rex'``, for version ``'2.5'`` it defaults to ``'egypt-classic'``. """), Parameter('variant', default='onscreen', description="""Specifies which variant of the use case to run, as listed in the benchmarks diff --git a/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar b/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar index 57d0fb1e..7bfbe225 100644 Binary files a/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar and b/wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar differ diff --git a/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index 2c244d64..5bbedf7b 100644 --- a/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -81,7 +81,7 @@ public class UiAutomation extends BaseUiAutomation { UiObject useCaseText = new UiObject(selector.className("android.widget.TextView") .text(useCase) ); - if (version.equals("2.7.0")){ + if (version.equals("2.7")){ UiObject variantText = useCaseText.getFromParent(selector.className("android.widget.TextView") .text(variant)); int scrolls = 0; @@ -94,7 +94,7 @@ public class UiAutomation extends BaseUiAutomation { } variantText.click(); } - else if (version.equals("2.5.1")){ + else if (version.equals("2.5")){ int scrolls = 0; while(!useCaseText.exists()) { testList.scrollForward(); @@ -123,7 +123,7 @@ public class UiAutomation extends BaseUiAutomation { public void waitForResults(String version, String useCase, int timeout) throws Exception { UiSelector selector = new UiSelector(); UiObject results = null; - if (version.equals("2.7.0")) + if (version.equals("2.7")) results = new UiObject(selector.text("Results").className("android.widget.TextView")); else results = new UiObject(selector.text(useCase).className("android.widget.TextView"));