sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-30 14:44:09 +00:00
Code Issues Releases Wiki Activity

Revert "Updated workload versions to match APK files"

Browse Source 
This reverts commit b426e00f2f.
This commit is contained in:
Sebastian Goscik
2016-09-19 13:56:22 +01:00
parent 1bbd3ef87a
commit f9ec869c7b
9 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wlauto/workloads/glbenchmark/__init__.py
View File

@@ -57,14 +57,14 @@ class Glb(AndroidUiAutoBenchmark):
view = 'com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBRender'
packages = {
'2.7': 'com.glbenchmark.glbenchmark27',
'2.5': 'com.glbenchmark.glbenchmark25',
'2.7.0': 'com.glbenchmark.glbenchmark27',
'2.5.1': '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': ['t-rex', 'egypt'],
'2.5': ['egypt-classic', 'egypt'],
'2.7.0': ['t-rex', 'egypt'],
'2.5.1': ['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', allowed_values=['2.7', '2.5'],
Parameter('version', default='2.7.0', allowed_values=['2.7.0', '2.5.1'],
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'`` it defaults
to ``'t-rex'``, for version ``'2.5'`` it defaults to ``'egypt-classic'``.
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'``.
"""),
Parameter('variant', default='onscreen',
description="""Specifies which variant of the use case to run, as listed in the benchmarks

BIN
wlauto/workloads/glbenchmark/com.arm.wlauto.uiauto.glb.jar
View File

Binary file not shown.

14
wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@@ -33,7 +33,7 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
import com.arm.wlauto.uiauto.BaseUiAutomation;
public class UiAutomation extends BaseUiAutomation {
public class UiAutomation extends BaseUiAutomation {
public static String TAG = "glb";
public static int maxScrolls = 15;
@@ -63,7 +63,7 @@ public class UiAutomation extends BaseUiAutomation {
extractResults();
iterations -= 1;
}
Bundle status = new Bundle();
getAutomationSupport().sendStatus(Activity.RESULT_OK, status);
}
@@ -81,9 +81,9 @@ public class UiAutomation extends BaseUiAutomation {
UiObject useCaseText = new UiObject(selector.className("android.widget.TextView")
.text(useCase)
);
if (version.equals("2.7")){
if (version.equals("2.7.0")){
UiObject variantText = useCaseText.getFromParent(selector.className("android.widget.TextView")
.text(variant));
.text(variant));
int scrolls = 0;
while(!variantText.exists()) {
testList.scrollForward();
@@ -94,7 +94,7 @@ public class UiAutomation extends BaseUiAutomation {
}
variantText.click();
}
else if (version.equals("2.5")){
else if (version.equals("2.5.1")){
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"))
if (version.equals("2.7.0"))
results = new UiObject(selector.text("Results").className("android.widget.TextView"));
else
results = new UiObject(selector.text(useCase).className("android.widget.TextView"));
@@ -135,7 +135,7 @@ public class UiAutomation extends BaseUiAutomation {
// starting GLB.
if (!results.waitForExists(TimeUnit.SECONDS.toMillis(timeout))) {
Log.v(TAG, "Results screen not found. Attempting to bring to foreground.");
String[] commandLine = {"am", "start",
String[] commandLine = {"am", "start",
"-a", "android.intent.action.MAIN",
"-c", "android.intent.category.LAUNCHER",
"-n", "com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBenchmarkDownloaderActivity"};