diff options
| author | Xin Li <delphij@google.com> | 2021-08-17 18:14:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-08-17 18:14:12 +0000 |
| commit | c541e8abb62a9a888de1cf48bbded105f7869cc0 (patch) | |
| tree | 8a9c3f56607bb90577557ddd3261d36ae2ec2b93 /drm/1.3/vts/functional/drm_hal_test_main.cpp | |
| parent | 1aa8cad8558884c9dd0293dffbf823e45614a25d (diff) | |
| parent | e287df40b90fe64c226f90c66353a33e8ef40063 (diff) | |
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
Diffstat (limited to 'drm/1.3/vts/functional/drm_hal_test_main.cpp')
| -rw-r--r-- | drm/1.3/vts/functional/drm_hal_test_main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drm/1.3/vts/functional/drm_hal_test_main.cpp b/drm/1.3/vts/functional/drm_hal_test_main.cpp index b8f64c0f6d..8abba694d7 100644 --- a/drm/1.3/vts/functional/drm_hal_test_main.cpp +++ b/drm/1.3/vts/functional/drm_hal_test_main.cpp @@ -94,27 +94,34 @@ INSTANTIATE_TEST_CASE_P(PerInstanceUuidV1_0, DrmHalVendorDecryptTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyFactoryTest); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_0, DrmHalClearkeyFactoryTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyPluginTest); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_0, DrmHalClearkeyPluginTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyDecryptTest); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_0, DrmHalClearkeyDecryptTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyTest); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_1, DrmHalClearkeyTest, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalTest); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_2, DrmHalTest, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyTestV1_2); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_2, DrmHalClearkeyTestV1_2, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalTestV1_3); INSTANTIATE_TEST_SUITE_P(PerInstanceUuidV1_3, DrmHalTestV1_3, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); |