diff options
| author | Dan Shi <dshi@google.com> | 2020-07-29 05:45:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 05:45:58 +0000 |
| commit | e5c9b5e7229ef69c77d32ee81428c5fcf69be0b8 (patch) | |
| tree | 651cd1d48841a84c4c8952c7ef3667b6918e83a2 /drm | |
| parent | bcd3acde22ef4d7fdf80347e756cdf1066b348b9 (diff) | |
| parent | 73122cd2847d4e753a30434381b7e74defe50c14 (diff) | |
| download | platform_hardware_interfaces-e5c9b5e7229ef69c77d32ee81428c5fcf69be0b8.tar.gz platform_hardware_interfaces-e5c9b5e7229ef69c77d32ee81428c5fcf69be0b8.tar.bz2 platform_hardware_interfaces-e5c9b5e7229ef69c77d32ee81428c5fcf69be0b8.zip | |
Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050
Change-Id: Ie5e956d4613f5e947c36ba4f1048f0c3aa8944ba
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_test_main.cpp | 3 | ||||
| -rw-r--r-- | drm/1.1/vts/functional/drm_hal_test_main.cpp | 1 | ||||
| -rw-r--r-- | drm/1.2/vts/functional/drm_hal_test_main.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drm/1.0/vts/functional/drm_hal_test_main.cpp b/drm/1.0/vts/functional/drm_hal_test_main.cpp index fd2538b051..25571368f4 100644 --- a/drm/1.0/vts/functional/drm_hal_test_main.cpp +++ b/drm/1.0/vts/functional/drm_hal_test_main.cpp @@ -63,9 +63,12 @@ INSTANTIATE_TEST_CASE_P(DrmHalVendorDecryptTestCases, DrmHalVendorDecryptTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyFactoryTest); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalClearkeyFactoryTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyPluginTest); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalClearkeyPluginTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyDecryptTest); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalClearkeyDecryptTest, testing::ValuesIn(kAllInstances), drm_vts::PrintParamInstanceToString); diff --git a/drm/1.1/vts/functional/drm_hal_test_main.cpp b/drm/1.1/vts/functional/drm_hal_test_main.cpp index c6965bdc39..2ecc6b4d6b 100644 --- a/drm/1.1/vts/functional/drm_hal_test_main.cpp +++ b/drm/1.1/vts/functional/drm_hal_test_main.cpp @@ -48,5 +48,6 @@ static const std::vector<DrmHalTestParam> kAllInstances = [] { return allInstancesWithClearKeyUuid; }(); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyTest); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalClearkeyTest, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); diff --git a/drm/1.2/vts/functional/drm_hal_test_main.cpp b/drm/1.2/vts/functional/drm_hal_test_main.cpp index ea6e63df6e..2eb18f1215 100644 --- a/drm/1.2/vts/functional/drm_hal_test_main.cpp +++ b/drm/1.2/vts/functional/drm_hal_test_main.cpp @@ -57,8 +57,10 @@ static const std::vector<DrmHalTestParam> kAllInstances = [] { return allInstanceUuidCombos; }(); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalTest); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalTest, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalClearkeyTestV1_2); INSTANTIATE_TEST_SUITE_P(PerInstance, DrmHalClearkeyTestV1_2, testing::ValuesIn(kAllInstances), PrintParamInstanceToString); |