GF/Skip tests: bootsWithCustomVendorPartitionForNonPvm
This test relies on device-tree for vendor partition digest,
however, Device tree support on x86_64 GF is not available.
Test: Check that test invocation is indeed ignored
Bug: 349365118
Change-Id: I3f300015dd80108d79e176b73d1eb8e220466bc6
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 c269125..1465e73 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -2403,7 +2403,8 @@
assumeSupportedDevice();
// TODO(b/325094712): Boot fails with vendor partition in Cuttlefish.
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());
// TODO(b/317567210): Boot fails with vendor partition in HWASAN enabled microdroid
// after introducing verification based on DT and fstab in microdroid vendor partition.
assumeFalse(