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

Merge pull request #401 from marcbonnici/uiauto2

Browse Source 
Uiauto2: Fixes leftover references to `.uiautoapk`
This commit is contained in:
setrofim 2017-06-08 11:41:51 +01:00 committed by GitHub
commit 48d0e1196c
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wlauto/commands/templates/uiauto_build_script
View File

@ -32,7 +32,7 @@ fi
# If successful move APK file to workload folder (overwrite previous) # If successful move APK file to workload folder (overwrite previous)
rm -f ../$package_name rm -f ../$package_name
if [[ -f app/build/apk/$package_name.apk ]]; then if [[ -f app/build/apk/$package_name.apk ]]; then
cp app/build/apk/$package_name.apk ../$package_name.uiautoapk cp app/build/apk/$package_name.apk ../$package_name.apk
else else
echo 'ERROR: UiAutomator apk could not be found!' echo 'ERROR: UiAutomator apk could not be found!'
exit 9 exit 9

2
wlauto/common/android/workload.py
View File

@ -49,7 +49,7 @@ class UiAutomatorWorkload(Workload):
This class should be subclassed by workloads that rely on android UiAutomator This class should be subclassed by workloads that rely on android UiAutomator
to work. This class handles installing the UI Automator APK to the device to work. This class handles installing the UI Automator APK to the device
and invoking it to run the workload. By default, it will look for the ``*.uiautoapk`` file and invoking it to run the workload. By default, it will look for the ``*.apk`` file
in the same directory as the .py file for the workload (this can be changed by overriding in the same directory as the .py file for the workload (this can be changed by overriding
the ``uiauto_file`` property in the subclassing workload). the ``uiauto_file`` property in the subclassing workload).

BIN
wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk
View File

Binary file not shown.

2
wlauto/workloads/applaunch/uiauto/app/src/main/java/com/arm/wlauto/uiauto/applaunch/UiAutomation.java
View File

@ -54,7 +54,7 @@ public void runUiAutomation() throws Exception{
// Get workload apk file parameters // Get workload apk file parameters
String workload = parameters.getString("workload"); String workload = parameters.getString("workload");
String workloadAPKPath = parameters.getString("workdir"); String workloadAPKPath = parameters.getString("workdir");
String workloadName = String.format("com.arm.wlauto.uiauto.%1s.uiautoapk",workload); String workloadName = String.format("com.arm.wlauto.uiauto.%1s.apk",workload);
String workloadAPKFile = String.format("%1s/%2s",workloadAPKPath, workloadName); String workloadAPKFile = String.format("%1s/%2s",workloadAPKPath, workloadName);
// Load the apk file // Load the apk file