From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED0C713835A for ; Mon, 31 May 2021 23:04:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B463E086D; Mon, 31 May 2021 23:04:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 019C2E086D for ; Mon, 31 May 2021 23:04:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28135340F0E for ; Mon, 31 May 2021 23:04:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F7BE79C for ; Mon, 31 May 2021 23:04:07 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1622502099.929e2ffe3708f6c6d2f409fa50b6a222874d4319.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/protobuf/protobuf-3.15.0.ebuild dev-libs/protobuf/protobuf-3.15.1.ebuild dev-libs/protobuf/protobuf-3.15.2.ebuild dev-libs/protobuf/protobuf-3.15.3.ebuild dev-libs/protobuf/protobuf-3.15.4.ebuild dev-libs/protobuf/protobuf-3.15.5.ebuild dev-libs/protobuf/protobuf-3.15.6.ebuild dev-libs/protobuf/protobuf-3.15.7.ebuild dev-libs/protobuf/protobuf-3.15.8.ebuild X-VCS-Directories: dev-libs/protobuf/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 929e2ffe3708f6c6d2f409fa50b6a222874d4319 X-VCS-Branch: master Date: Mon, 31 May 2021 23:04:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: adf4dd2f-b8fc-42b5-85bb-c417a4e87a15 X-Archives-Hash: 383f118ff22d43c759b9b667959b2c33 commit: 929e2ffe3708f6c6d2f409fa50b6a222874d4319 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed May 26 00:00:00 2021 +0000 Commit: Mike Gilbert gentoo 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 Apache.Org> Signed-off-by: Mike Gilbert 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 }