| commit | 20235e1b30eeb01f97a45ccdfde0d081188add83 | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Tue Dec 17 07:08:28 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 17 07:08:28 2024 -0800 |
| tree | aea888278c78729e0f464c837e38ee4d069cce0d | |
| parent | e74df248cec4cfc9e241a7fc0115691df9f8edfd [diff] | |
| parent | 62e68273366e6bc34ed8b4ce9a95ea941120567a [diff] |
Merge "[xTS] Enable MicrodroidTests on GSI" into main am: 62e6827336 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3412638 Change-Id: Idcff4825c52ef823afbab87967f5a289f7aa71ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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)