Merge "GF/Skip tests: Final VM secrets maybe same" into main
diff --git a/tests/helper/src/java/com/android/microdroid/test/common/DeviceProperties.java b/tests/helper/src/java/com/android/microdroid/test/common/DeviceProperties.java
index 69527be..af68eb3 100644
--- a/tests/helper/src/java/com/android/microdroid/test/common/DeviceProperties.java
+++ b/tests/helper/src/java/com/android/microdroid/test/common/DeviceProperties.java
@@ -33,6 +33,8 @@
private static final String CUTTLEFISH_DEVICE_PREFIX = "vsoc_";
private static final String CUTTLEFISH_ARM64_DEVICE_PREFIX = "vsoc_arm64";
+ private static final String GOLDFISH_DEVICE_PREFIX = "emu64";
+ private static final String GOLDFISH_ARM64_DEVICE_PREFIX = "emu64a";
private static final String USER_BUILD_TYPE = "user";
private static final String HWASAN_SUFFIX = "_hwasan";
@@ -65,6 +67,23 @@
}
/**
+ * @return whether the device is a cuttlefish device.
+ */
+ public boolean isGoldfish() {
+ String vendorDeviceName = getProperty(KEY_VENDOR_DEVICE);
+ return vendorDeviceName != null && vendorDeviceName.startsWith(GOLDFISH_DEVICE_PREFIX);
+ }
+
+ /**
+ * @return whether the device is a cuttlefish device running on 64 bit Arm.
+ */
+ public boolean isGoldfishArm64() {
+ String vendorDeviceName = getProperty(KEY_VENDOR_DEVICE);
+ return vendorDeviceName != null
+ && vendorDeviceName.startsWith(GOLDFISH_ARM64_DEVICE_PREFIX);
+ }
+
+ /**
* @return whether the build is HWASAN.
*/
public boolean isHwasan() {
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 91ff4d8..8169376 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -81,6 +81,14 @@
return getDeviceProperties().isCuttlefishArm64();
}
+ public static boolean isGoldfish() {
+ return getDeviceProperties().isGoldfish();
+ }
+
+ private static boolean isGoldfishArm64() {
+ return getDeviceProperties().isGoldfishArm64();
+ }
+
public static boolean isHwasan() {
return getDeviceProperties().isHwasan();
}
@@ -246,10 +254,11 @@
.that(KERNEL_VERSION)
.isNotEqualTo("5.4");
- // Cuttlefish on Arm 64 doesn't and cannot support any form of virtualization, so there's
- // no point running any of these tests.
- assume().withMessage("Virtualization not supported on Arm64 Cuttlefish. b/341889915")
- .that(isCuttlefishArm64())
+ // Cuttlefish/Goldfish on Arm 64 doesn't and cannot support any form of virtualization,
+ // so there's no point running any of these tests.
+ assume().withMessage("Virtualization not supported on Arm64 Cuttlefish/Goldfish."
+ + " b/341889915")
+ .that(isCuttlefishArm64() || isGoldfishArm64())
.isFalse();
}
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 658b1bb..c269125 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1219,7 +1219,8 @@
// 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());
+ "Cuttlefish/Goldfish doesn't support device tree under /proc/device-tree",
+ isCuttlefish() || isGoldfish());
grantPermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
VirtualMachineConfig normalConfig =
@@ -1693,7 +1694,8 @@
// 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());
+ "Cuttlefish/Goldfish doesn't support device tree under /proc/device-tree",
+ isCuttlefish() || isGoldfish());
VirtualMachineConfig config =
newVmConfigBuilderWithPayloadBinary("MicrodroidTestNativeLib.so")