commit dd1ed654308095a9157b3b60fac2f7ead33156ba
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 22 00:32:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 22 00:32:11 2024 +0000
tree e343bb2ce77c6723cc24e7bc9087ad3eb770b5ed
parent 9f57f13732ba05870c99da43081517e9c011abff
parent 960534ba63feab9d37ae83e52b85a0e5d032fc25

Merge "GF/Skip tests: bootsWithCustomVendorPartitionForNonPvm" into main

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

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(