| commit | 62e68273366e6bc34ed8b4ce9a95ea941120567a | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Tue Dec 17 06:30:16 2024 -0800 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 17 06:30:16 2024 -0800 |
| tree | aea888278c78729e0f464c837e38ee4d069cce0d | |
| parent | f2bdfe8ba05ef4b9917654f538fd846373987859 [diff] | |
| parent | 5171f25fbba775ab1e73c8bdc765b275cb3c9016 [diff] |
Merge "[xTS] Enable MicrodroidTests on GSI" into main
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 e6f15ff..83dc58e 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
@@ -207,9 +207,6 @@ assume().withMessage("Skip where protected VMs aren't supported") .that(capabilities & VirtualMachineManager.CAPABILITY_PROTECTED_VM) .isNotEqualTo(0); - assume().withMessage("Testing protected VMs on GSI isn't supported. b/272443823") - .that(isGsi()) - .isFalse(); // TODO(b/376870129): remove this assume().withMessage("pVMs with 16k kernel are not supported yet :(") .that(mOs)