Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c9a3a0c authored by Chris Forbes's avatar Chris Forbes Committed by Dan Shi
Browse files

Mark GraphicsMapperHidlTest as allowing not being instantiated 

Only the variant(s) actually implemented by the device will be
instantiated.

This is consistent with tests for other versioned or optional HALs.

Bug: b/167222309
Test: atest VtsHalGraphicsMapperV2_0TargetTest:GoogleTestVerification#UninstantiatedParameterizedTestSuite<GraphicsMapperHidlTest> -- --abi arm64-v8a
Change-Id: I4f1bfbad47bdbf75578ec48a3a56fb5351e7729a
parent a9f24023

graphics/mapper/2.0/vts/functional/VtsHalGraphicsMapperV2_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ TEST_P(GraphicsMapperHidlTest, UnlockNegative) { 
#endif

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GraphicsMapperHidlTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, GraphicsMapperHidlTest,

        testing::Combine(

graphics/mapper/2.1/vts/functional/VtsHalGraphicsMapperV2_1TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ TEST_P(GraphicsMapperHidlTest, CreateDescriptor_2_1Negative) { 
    });

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GraphicsMapperHidlTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, GraphicsMapperHidlTest,

        testing::Combine(

graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ TEST_P(GraphicsMapperHidlTest, IsSupportedY16) { 
    ASSERT_NO_FATAL_FAILURE(supported = mGralloc->isSupported(info));

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GraphicsMapperHidlTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, GraphicsMapperHidlTest,

        testing::Combine(

graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2592,6 +2592,7 @@ TEST_P(GraphicsMapperHidlTest, GetReservedRegionBadBuffer) { 
    ASSERT_EQ(0, reservedSize);

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GraphicsMapperHidlTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, GraphicsMapperHidlTest,

        testing::Combine(