commit 18408a74ae1e349d57d46e8e0de240afe1c8184d
author Inseob Kim <inseob@google.com> Sat Feb 22 08:28:52 2025 +0900
committer Inseob Kim <inseob@google.com> Sat Feb 22 08:31:48 2025 +0900
tree a1959ce94faff9fe97ea3261c1aa998635096c62
parent 28552bd96d7dc972c71b8d86b205d8b7c23a7357

Run ComposTestCase on multiple kernels

Bug: 302465542
Test: atest ComposTestCase
Change-Id: I2789923b3dbefda99587d31d2d4b5ef8def0983a

android/compos_verify/verify.rs

diff --git a/android/compos_verify/verify.rs b/android/compos_verify/verify.rs
index a88d00c..85e4425 100644
--- a/android/compos_verify/verify.rs
+++ b/android/compos_verify/verify.rs
@@ -47,6 +47,10 @@
     /// Starts the VM in debug mode
     #[clap(long, action)]
     debug: bool,
+
+    /// OS for the VM.
+    #[clap(long, default_value = "microdroid")]
+    os: String,
 }
 
 #[derive(ValueEnum, Clone)]
@@ -118,7 +122,7 @@
         &idsig_manifest_ext_apk,
         &VmParameters {
             name: String::from("ComposVerify"),
-            os: String::from("microdroid"),
+            os: args.os,
             cpu_topology: VmCpuTopology::OneCpu, // This VM runs very little work at boot
             debug_mode: args.debug,
             ..Default::default()

tests/ComposHostTestCases/java/android/compos/test/ComposTestCase.java

diff --git a/tests/ComposHostTestCases/java/android/compos/test/ComposTestCase.java b/tests/ComposHostTestCases/java/android/compos/test/ComposTestCase.java
index 6e583c0..4812485 100644
--- a/tests/ComposHostTestCases/java/android/compos/test/ComposTestCase.java
+++ b/tests/ComposHostTestCases/java/android/compos/test/ComposTestCase.java
@@ -34,10 +34,13 @@
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.FileInputStreamSource;
 import com.android.tradefed.result.LogDataType;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.DeviceParameterizedRunner;
 import com.android.tradefed.util.CommandResult;
 import com.android.tradefed.util.RunUtil;
 
+import junitparams.Parameters;
+import junitparams.naming.TestCaseName;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -46,9 +49,11 @@
 import org.junit.runner.RunWith;
 
 import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RootPermissionTest
-@RunWith(DeviceJUnit4ClassRunner.class)
+@RunWith(DeviceParameterizedRunner.class)
 public final class ComposTestCase extends MicrodroidHostTestCaseBase {
 
     // Binaries used in test. (These paths are valid both in host and Microdroid.)
@@ -78,6 +83,12 @@
             "dalvik.vm.systemservercompilerfilter";
     private String mBackupSystemServerCompilerFilter;
 
+    public static List<Object[]> osVersions() {
+        return SUPPORTED_OSES.keySet().stream()
+                .map(osKey -> new Object[] {osKey})
+                .collect(Collectors.toList());
+    }
+
     @Rule public TestLogData mTestLogs = new TestLogData();
     @Rule public TestName mTestName = new TestName();
 
@@ -121,18 +132,24 @@
     }
 
     @Test
-    public void testOdrefreshSpeed() throws Exception {
+    @Parameters(method = "osVersions")
+    @TestCaseName("{method}_os_{0}")
+    public void testOdrefreshSpeed(String os) throws Exception {
+        assumeKernelSupported(os);
         setPropertyOrThrow(getDevice(), SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME, "speed");
-        testOdrefresh();
+        testOdrefresh(os);
     }
 
     @Test
-    public void testOdrefreshSpeedProfile() throws Exception {
+    @Parameters(method = "osVersions")
+    @TestCaseName("{method}_os_{0}")
+    public void testOdrefreshSpeedProfile(String os) throws Exception {
+        assumeKernelSupported(os);
         setPropertyOrThrow(getDevice(), SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME, "speed-profile");
-        testOdrefresh();
+        testOdrefresh(os);
     }
 
-    private void testOdrefresh() throws Exception {
+    private void testOdrefresh(String os) throws Exception {
         CommandRunner android = new CommandRunner(getDevice());
 
         // Prepare the groundtruth. The compilation on Android should finish successfully.
@@ -157,7 +174,11 @@
             long start = System.currentTimeMillis();
             result =
                     android.runForResultWithTimeout(
-                            ODREFRESH_TIMEOUT_MS, COMPOSD_CMD_BIN, "test-compile");
+                            ODREFRESH_TIMEOUT_MS,
+                            COMPOSD_CMD_BIN,
+                            "test-compile",
+                            "--os",
+                            SUPPORTED_OSES.get(os));
             long elapsed = System.currentTimeMillis() - start;
             assertThat(result).exitCode().isEqualTo(0);
             CLog.i("Comp OS compilation took " + elapsed + "ms");
@@ -179,7 +200,7 @@
         android.run("test -f " + ODREFRESH_OUTPUT_DIR + "/compos.info.signature");
 
         // Expect the CompOS signature to be valid
-        android.run(COMPOS_VERIFY_BIN + " --debug --instance test");
+        android.run(COMPOS_VERIFY_BIN + " --debug --instance test --os " + SUPPORTED_OSES.get(os));
     }
 
     private void assertVmBccIsValid() throws Exception {