commit 11fe0178b9b57b851412a72bbf1ec31196194db6
author Jaewan Kim <jaewan@google.com> Mon Feb 27 07:31:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 27 07:31:59 2023 +0000
tree 7449955922496170dc39d8d630d1a3397789988e
parent 46a79d9a1752f5007791e1caf00f7d5f534ccf3a
parent 89bac8438ef248fc9cb518c60e2d7c343315e2b5

Merge "Check non-user build for PvmfwDebugPolicyHostTests"

tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java

diff --git a/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java b/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
index d0b7c0e..755613a 100644
--- a/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/PvmfwDebugPolicyHostTests.java
@@ -22,6 +22,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assume.assumeTrue;
+import static org.junit.Assume.assumeFalse;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,6 +92,7 @@
         assumeTrue(
                 "Skip if protected VMs are not supported",
                 mAndroidDevice.supportsMicrodroid(/* protectedVm= */ true));
+        assumeFalse("Test requires setprop for using custom pvmfw and adb root", isUserBuild());
 
         mAndroidDevice.enableAdbRoot();