| commit | 9ddc9fe5225016cf4fee7436533137b896f20527 | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Fri Nov 18 01:12:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 18 01:12:35 2022 +0000 |
| tree | 966e6eb181448cbfa8cffa2c9422537bd49167a5 | |
| parent | accfdbc1376558c31dfd2cc53579a355e74ed8cd [diff] | |
| parent | 57ace4ffd873ca085c465947d25178056ef3cea5 [diff] |
Skip tests on devices without virtualization_framework sys feature am: 6ce2215cab am: b851d721f2 am: 57ace4ffd8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2307101 Change-Id: Iba5a843c9bb37105e0c0eb41eee6e49b1222a508 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java index 43fe615..9bcd1d3 100644 --- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java +++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -100,6 +100,9 @@ public static void testIfDeviceIsCapable(ITestDevice androidDevice) throws Exception { assumeTrue("Need an actual TestDevice", androidDevice instanceof TestDevice); TestDevice testDevice = (TestDevice) androidDevice; + assumeTrue( + "Requires VM support", + testDevice.hasFeature("android.software.virtualization_framework")); assumeTrue("Requires VM support", testDevice.supportsMicrodroid()); }