commit d7f1c1d638dae66352fefab091154fcd5463e9e6
author Shawn Willden <swillden@google.com> Fri Apr 02 14:44:42 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 02 14:44:42 2021 +0000
tree 4e00c3cb89e9b8722b3914c7533e8e6af61eee1b
parent b21b4a36634f3771a8e2ed34a2ef15174c87e876
parent 7e71f1e5c52faf4004091baa58320f54458b664f

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

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h

diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
index 86bc9c4..4d97ea9 100644
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
@@ -284,7 +284,8 @@
 #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