CF/Skip tests: Final VM secrets maybe same
Device tree support on CF is broken due to which Instance-Id is not
visible to VM, which (with aosp/2975594) contributes to the hidden input
& is responsible for differentiating the secrets of 2 VMs. Skip these
tests for CF.
Note: Both protected & non-protected Vms on arm64 devices support it.
Test: Check that test invocation is indeed ignored
Bug: 291213394
Change-Id: I57127352f0314e9241b75c67c88b4c78ba8635b1
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 3b8b4ac..51aace4 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1070,6 +1070,10 @@
})
public void instancesOfSameVmHaveDifferentCdis() throws Exception {
assumeSupportedDevice();
+ // TODO(b/325094712): VMs on CF with same payload have the same secret. This is because
+ // `instance-id` which is input to DICE is contained in DT which is missing in CF.
+ assumeFalse(
+ "Cuttlefish doesn't support device tree under /proc/device-tree", isCuttlefish());
grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
VirtualMachineConfig normalConfig =
@@ -1504,6 +1508,10 @@
@CddTest(requirements = {"9.17/C-1-1"})
public void encryptedStorageIsInaccessibleToDifferentVm() throws Exception {
assumeSupportedDevice();
+ // TODO(b/325094712): VMs on CF with same payload have the same secret. This is because
+ // `instance-id` which is input to DICE is contained in DT which is missing in CF.
+ assumeFalse(
+ "Cuttlefish doesn't support device tree under /proc/device-tree", isCuttlefish());
VirtualMachineConfig config =
newVmConfigBuilderWithPayloadBinary("MicrodroidTestNativeLib.so")