commit a7866789f5dee302bec55dbf85877d797a1fe5ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 11 17:39:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 17:39:48 2024 +0000
tree 4b4c38163edec5e0a92f693f53e0635e637ac609
parent ef2fe46bb2a92aadb9f54c6ec1ee787cae33b0fe
parent ba17f35f164773560ebd06cf84fabeee6d396278

Merge "Use inline assembly for UART MMIO." into main

compos/tests/java/android/compos/test/ComposTestCase.java

diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index bd011fa..b31f4f3 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -24,11 +24,13 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.platform.test.annotations.RootPermissionTest;
 
 import com.android.microdroid.test.host.CommandRunner;
 import com.android.microdroid.test.host.MicrodroidHostTestCaseBase;
+import com.android.tradefed.device.TestDevice;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.FileInputStreamSource;
 import com.android.tradefed.result.LogDataType;
@@ -85,6 +87,8 @@
         assumeDeviceIsCapable(getDevice());
         // Test takes too long to run on Cuttlefish (b/292824951).
         assumeFalse("Skipping test on Cuttlefish", isCuttlefish());
+        // CompOS requires a protected VM
+        assumeTrue(((TestDevice) getDevice()).supportsMicrodroid(/*protectedVm*/ true));
 
         String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
         if (value == null) {