commit: 929e2ffe3708f6c6d2f409fa50b6a222874d4319 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Wed May 26 00:00:00 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon May 31 23:01:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929e2ffe
dev-libs/protobuf: Disable tests failing on 32-bit architectures. Closes: https://bugs.gentoo.org/788436 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-libs/protobuf/protobuf-3.15.0.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.1.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.2.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.3.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.4.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.5.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.6.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.7.ebuild | 9 +++++++++ dev-libs/protobuf/protobuf-3.15.8.ebuild | 9 +++++++++ 9 files changed, 81 insertions(+) diff --git a/dev-libs/protobuf/protobuf-3.15.0.ebuild b/dev-libs/protobuf/protobuf-3.15.0.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.0.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.1.ebuild b/dev-libs/protobuf/protobuf-3.15.1.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.1.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.2.ebuild b/dev-libs/protobuf/protobuf-3.15.2.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.2.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.3.ebuild b/dev-libs/protobuf/protobuf-3.15.3.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.3.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.3.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.4.ebuild b/dev-libs/protobuf/protobuf-3.15.4.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.4.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.4.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.5.ebuild b/dev-libs/protobuf/protobuf-3.15.5.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.5.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.5.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.6.ebuild b/dev-libs/protobuf/protobuf-3.15.6.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.6.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.6.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.7.ebuild b/dev-libs/protobuf/protobuf-3.15.7.ebuild index 9cadeaf4923..d1feac0db81 100644 --- a/dev-libs/protobuf/protobuf-3.15.7.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.7.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf } diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild index 7fff0e4d377..06466128520 100644 --- a/dev-libs/protobuf/protobuf-3.15.8.ebuild +++ b/dev-libs/protobuf/protobuf-3.15.8.ebuild @@ -49,6 +49,15 @@ src_prepare() { # https://github.com/protocolbuffers/protobuf/issues/8082 sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die + # https://github.com/protocolbuffers/protobuf/issues/8459 + sed \ + -e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \ + -i src/google/protobuf/arena_unittest.cc || die + + # https://github.com/protocolbuffers/protobuf/issues/8460 + sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die + eautoreconf }
