Merge "Allow KeyMint tests to pass on devices w/out KeyMint"

2021-04-02 14:44:42 +00:00 · 2021-04-02 14:44:42 +00:00 · d7f1c1d638
commit d7f1c1d638
parent b21b4a3663 7e71f1e5c5
1 changed files with 2 additions and 1 deletions
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
@ -284,7 +284,8 @@ AuthorizationSet SwEnforcedAuthorizations(const vector<KeyCharacteristics>& key_
 #define INSTANTIATE_KEYMINT_AIDL_TEST(name)                                          \
    INSTANTIATE_TEST_SUITE_P(PerInstance, name,                                      \
                             testing::ValuesIn(KeyMintAidlTestBase::build_params()), \
-                             ::android::PrintInstanceNameToString)
+                             ::android::PrintInstanceNameToString);                  \
+    GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(name);

 }  // namespace test