Ignore testMicrodroidDebugBootTime_withVendorPartition
After introducing VM reference DT, vendor hashtree digest is brought
from host DT defined by bootloader unlike extracting it from microdroid
vendor image before.
So like aosp/2949526, we'll suspend a benchmark test booting vendor
partition as well, since it uses distinguished microdroid vendor image
for testing as well.
Bug: 323496175
Test: atest MicrodroidBenchmarks#testMicrodroidDebugBootTime_withVendorPartition
Change-Id: Idaed4720692f57df4733109a5395ae90d977ecc9
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index b9faa85..e9c84fb 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -49,6 +49,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
@@ -276,6 +277,10 @@
(builder) -> builder);
}
+ // TODO(b/323768068): Enable this test when we can inject vendor digest for test purpose.
+ // After introducing VM reference DT, non-pVM cannot trust test_microdroid_vendor_image.img
+ // as well, because it doesn't pass the hashtree digest of testing image into VM.
+ @Ignore
@Test
public void testMicrodroidDebugBootTime_withVendorPartition() throws Exception {
assume().withMessage("Cuttlefish doesn't support device tree under" + " /proc/device-tree")
@@ -286,11 +291,6 @@
assume().withMessage("Boot with vendor partition is failing in HWASAN enabled Microdroid.")
.that(isHwasan())
.isFalse();
- assume().withMessage(
- "Skip test for protected VM, pvmfw config data doesn't contain any"
- + " information of test images, such as root digest.")
- .that(mProtectedVm)
- .isFalse();
assumeFeatureEnabled(VirtualMachineManager.FEATURE_VENDOR_MODULES);
File vendorDiskImage =
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 86f0770..bd19b4b 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -2093,7 +2093,7 @@
.contains("android.permission.USE_CUSTOM_VIRTUAL_MACHINE permission");
}
- // TODO(b/323768068): Enable this test when we can inject vendor hashkey for test purpose.
+ // TODO(b/323768068): Enable this test when we can inject vendor digest for test purpose.
// After introducing VM reference DT, non-pVM cannot trust test_microdroid_vendor_image.img
// as well, because it doesn't pass the hashtree digest of testing image into VM.
@Ignore