From 78e07d5dff32cb43f49d790bd2ce9f07874a63c2 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Thu, 13 Apr 2023 10:54:42 -0700 Subject: [PATCH] Allow uninstantiated BootloaderStateTest No tests are instantiated if KeyMint is present on the the device. Explicitly allow that. Bug: 277975776 Test: VtsAidlKeyMintTargetTest Change-Id: I88f1c0a81f36d198dabcb1420b62a00bacdbb6e7 --- security/keymint/aidl/vts/functional/BootloaderStateTest.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp index fdadad4dfe..723edeef3d 100644 --- a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp +++ b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp @@ -79,8 +79,6 @@ TEST_P(BootloaderStateTest, IsUnlocked) { ASSERT_FALSE(attestedBootloaderState) << "This test runs as root. Bootloader must be unlocked."; } -INSTANTIATE_TEST_SUITE_P(PerInstance, BootloaderStateTest, - testing::ValuesIn(getAidlHalInstanceNames(IKeyMintDevice::descriptor)), - ::android::PrintInstanceNameToString); +INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest); } // namespace aidl::android::hardware::security::keymint::test