mirror of
				https://github.com/ARM-software/workload-automation.git
				synced 2025-10-31 07:04:17 +00:00 
			
		
		
		
	geekbench: Add/fix support for Geekbench5
The non corporate version of geekbench5 didn't work although the code had everything needed, except for a number of tiny required tweaks: 1. Add '5' in the supported versions in __init__.py 2. Fix the name of the android package in__init__.py and UiAutomation.java 3. Improve handling of minorVersion to fix potential exception when we don't specify the minorVersion number in the yaml file. Launching geekbench5 works fine when it's the only one installed. But if you have multiple versions, then using the version string in the yaml agenda didn't like specifying '5' as the version and threw exception out of bound because we assume '5.X' as input. No reason I'm aware of to force support for a specific version of geekbench5. So keep it relaxed until we know for sure it breaks with a specific version. Signed-off-by: Qais Yousef <qais.yousef@arm.com>
This commit is contained in:
		
				
					committed by
					
						 Marc Bonnici
						Marc Bonnici
					
				
			
			
				
	
			
			
			
						parent
						
							9c7bae3440
						
					
				
				
					commit
					b109acac05
				
			| @@ -53,7 +53,8 @@ public class UiAutomation extends BaseUiAutomation { | ||||
|         params = getParams(); | ||||
|         version = params.getString("version").split("\\."); | ||||
|         majorVersion = Integer.parseInt(version[0]); | ||||
|         minorVersion = Integer.parseInt(version[1]); | ||||
| 	if (version.length > 1) | ||||
| 		minorVersion = Integer.parseInt(version[1]); | ||||
|         isCorporate = params.getBoolean("is_corporate"); | ||||
|         loops = params.getInt("loops"); | ||||
|     } | ||||
| @@ -140,7 +141,7 @@ public class UiAutomation extends BaseUiAutomation { | ||||
|         scrollPage(); | ||||
|  | ||||
|         String packageName = isCorporate ? "com.primatelabs.geekbench.*.corporate" | ||||
|                                          : "com.primatelabs.geekbench"; | ||||
|                                          : "com.primatelabs.geekbench.*"; | ||||
|  | ||||
|         UiObject runButton = | ||||
| 	    mDevice.findObject(new UiSelector().resourceIdMatches(packageName + ":id/runCpuBenchmarks")); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user