Merge "gralloc4-vts: return after GTEST_SUCCEED" (368c0d9e) · Commits · e / os / android_hardware_interfaces

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ class GraphicsMapperHidlTest
		Error err = mGralloc->set(bufferHandle, metadataType, metadata);
		if (err == Error::UNSUPPORTED) {
		GTEST_SUCCEED() << "setting this metadata is unsupported";
		return;
		}
		ASSERT_EQ(err, Error::NONE);

		@@ -920,6 +921,7 @@ TEST_P(GraphicsMapperHidlTest, GetProtectedContent) {
		bufferHandle = mGralloc->allocate(info, true, true);
		if (bufferHandle) {
		GTEST_SUCCEED() << "unable to allocate protected content";
		return;
		}

		hidl_vec<uint8_t> vec;
		@@ -1237,6 +1239,7 @@ TEST_P(GraphicsMapperHidlTest, SetUsageProtected) {
		bufferHandle = mGralloc->allocate(info, true, true);
		if (bufferHandle) {
		GTEST_SUCCEED() << "unable to allocate protected content";
		return;
		}

		uint64_t usage = static_cast<uint64_t>(BufferUsage::COMPOSER_OVERLAY);
		@@ -1280,6 +1283,7 @@ TEST_P(GraphicsMapperHidlTest, SetProtectedContent) {
		bufferHandle = mGralloc->allocate(info, true, true);
		if (bufferHandle) {
		GTEST_SUCCEED() << "unable to allocate protected content";
		return;
		}

		uint64_t protectedContent = 0;
		@@ -1407,6 +1411,7 @@ TEST_P(GraphicsMapperHidlTest, SetPlaneLayouts) {
		Error err = mGralloc->set(bufferHandle, gralloc4::MetadataType_PlaneLayouts, vec);
		if (err == Error::UNSUPPORTED) {
		GTEST_SUCCEED() << "setting this metadata is unsupported";
		return;
		}
		ASSERT_EQ(err, Error::NONE);

		@@ -1779,6 +1784,7 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoPixelFormatFourCC) {
		mDummyDescriptorInfo, gralloc4::MetadataType_PixelFormatFourCC, &vec);
		if (err == Error::UNSUPPORTED) {
		GTEST_SUCCEED() << "setting this metadata is unsupported";
		return;
		}
		ASSERT_EQ(err, Error::NONE);

		@@ -1795,6 +1801,7 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoPixelFormatModifier) {
		mDummyDescriptorInfo, gralloc4::MetadataType_PixelFormatModifier, &vec);
		if (err == Error::UNSUPPORTED) {
		GTEST_SUCCEED() << "setting this metadata is unsupported";
		return;
		}
		ASSERT_EQ(err, Error::NONE);

		@@ -1824,6 +1831,7 @@ TEST_P(GraphicsMapperHidlTest, GetFromBufferDescriptorInfoAllocationSize) {
		gralloc4::MetadataType_AllocationSize, &vec);
		if (err == Error::UNSUPPORTED) {
		GTEST_SUCCEED() << "setting this metadata is unsupported";
		return;
		}
		ASSERT_EQ(err, Error::NONE);