| commit | dd9cf030534a21a9b3244788b9dcbee04abbbdbb | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 02 17:33:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 17:33:25 2021 +0000 |
| tree | b5008f1226011418a8f5f0b8e0d84b063301c5d9 | |
| parent | 2204408b9a37e256dc62165c82c2584f53145806 [diff] | |
| parent | e8589f0da982ee849b611352b8d65166e674a99d [diff] |
Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93 am: 1b5bf4a339 am: e8589f0da9 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901 Change-Id: Iaf9015d5133f118e6764e20fadcd44f2a542dde5
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