| commit | 1b5bf4a339c0633c3613b72969b65df33f692d01 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 02 16:10:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 16:10:29 2021 +0000 |
| tree | 5b98fccb8819f581fd4ec53c7c9794f982208483 | |
| parent | fa5c497e56653099465a250cc241dc8caa64f2e2 [diff] | |
| parent | 1da5562f934c437b8019e637a3c2085bcc733ea4 [diff] |
Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901 Change-Id: Iab23fbab7c1c37e7e50abe426d6cba02c163a35c
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