commit 107acee81dd59337ce3894044d59d6953e4c7a47
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 10 20:36:48 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 10 20:36:48 2025 -0700
tree 5fdebd93ad56f9a0ca4b8f7b647ee98d986e5dc9
parent fe53048d9397837cb8f65a65f45b9fefc4c41f49
parent 57487a3f02e42715724a1d361fb198ecd0272112

Merge "MicrodroidHostTests: add VM type preconditions to all tests" into main am: 0795cd4826 am: 57487a3f02

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3533588

Change-Id: Ie9ffdde84047b805bfd05d0efbb207481ab94c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java

diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index 5513af6..1d8d59a 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -555,6 +555,7 @@
             throws Exception {
         // Preconditions
         assumeKernelSupported(os);
+        assumeVmTypeSupported(os, false);
 
         File key = findTestFile("test.com.android.virt.pem");
         Map<String, File> keyOverrides = Map.of();
@@ -582,6 +583,7 @@
     public void testBootFailsWhenVbMetaDigestDoesNotMatchBootconfig(String os) throws Exception {
         // protectedVmWithImageSignedWithDifferentKeyRunsPvmfw() is the protected case.
         assumeKernelSupported(os);
+        assumeVmTypeSupported(os, false);
 
         // Sign everything with key1 except vbmeta
         File key = findTestFile("test.com.android.virt.pem");
@@ -1155,6 +1157,8 @@
     @Test
     @CddTest
     public void testRunEmptyPayload() throws Exception {
+        assumeVmTypeSupported("microdroid", false);
+
         CommandRunner android = new CommandRunner(getDevice());
 
         // Create the idsig file for the APK