Merge "Run libavf VTS only on supported devices" into main am: 94816f7a29 am: 1855033bdc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3433480
Change-Id: I8455bb32217c75068667fad77b94656d6768b0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/vts/Android.bp b/tests/vts/Android.bp
index 35fbcdc..c8e2523 100644
--- a/tests/vts/Android.bp
+++ b/tests/vts/Android.bp
@@ -20,6 +20,7 @@
"libavf_bindgen",
"libciborium",
"liblog_rust",
+ "libhypervisor_props",
"libscopeguard",
"libservice_vm_comm",
"libvsock",
diff --git a/tests/vts/src/vts_libavf_test.rs b/tests/vts/src/vts_libavf_test.rs
index ba38a2e..e30c175 100644
--- a/tests/vts/src/vts_libavf_test.rs
+++ b/tests/vts/src/vts_libavf_test.rs
@@ -177,10 +177,20 @@
#[test]
fn test_run_rialto_protected() -> Result<()> {
- run_rialto(true /* protected_vm */)
+ if hypervisor_props::is_protected_vm_supported()? {
+ run_rialto(true /* protected_vm */)
+ } else {
+ info!("pVMs are not supported on device. skipping test");
+ Ok(())
+ }
}
#[test]
fn test_run_rialto_non_protected() -> Result<()> {
- run_rialto(false /* protected_vm */)
+ if hypervisor_props::is_vm_supported()? {
+ run_rialto(false /* protected_vm */)
+ } else {
+ info!("non-pVMs are not supported on device. skipping test");
+ Ok(())
+ }
}