| commit | 6766508f3f0270e69f62c27d63b8f1139150c9e5 | [log] [tgz] |
|---|---|---|
| author | Elie Kheirallah <khei@google.com> | Thu Nov 14 02:46:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 14 02:46:12 2024 +0000 |
| tree | 84cc4cd9198b623b1192b2c5e2fd9cf4f6d7cccc | |
| parent | 64cb7c572c37612435e93d46d139e3fcc6802590 [diff] | |
| parent | 39d8f99b0e13c7f9ef5f76afc0f334f0bd87d366 [diff] |
Merge "Enable Device Tree backcompat tests" into main am: 3a3c34bbd1 am: 39d8f99b0e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3329234 Change-Id: I8db64256f2c8808a64daad9048792eb38b63dc67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java index adab521..03d7fef 100644 --- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java +++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -1345,9 +1345,8 @@ } @Test - @Parameters(method = "gkiVersions") + @Parameters(method = "osVersions") @TestCaseName("{method}_os_{0}") - @Ignore("b/360388014") // TODO(b/360388014): fix & re-enable public void microdroidDeviceTreeCompat(String os) throws Exception { assumeArm64Supported(); final String configPath = "assets/vm_config.json"; @@ -1374,9 +1373,8 @@ } @Test - @Parameters(method = "gkiVersions") + @Parameters(method = "osVersions") @TestCaseName("{method}_os_{0}") - @Ignore("b/360388014") // TODO(b/360388014): fix & re-enable public void microdroidProtectedDeviceTreeCompat(String os) throws Exception { assumeArm64Supported(); final String configPath = "assets/vm_config.json";