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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6ED44159C9B for ; Tue, 13 Aug 2024 13:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AC4CE2B6E; Tue, 13 Aug 2024 13:05:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A818E2B6E for ; Tue, 13 Aug 2024 13:05:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 144F033BF29 for ; Tue, 13 Aug 2024 13:05:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3E221ECD for ; Tue, 13 Aug 2024 13:05:16 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1723554223.cdbb1f6f8bca88322e6c68fa7fc142122cd77a16.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bear/, dev-util/bear/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bear/bear-3.1.4-r1.ebuild dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch X-VCS-Directories: dev-util/bear/files/ dev-util/bear/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: cdbb1f6f8bca88322e6c68fa7fc142122cd77a16 X-VCS-Branch: master Date: Tue, 13 Aug 2024 13:05:16 +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: d4fd006d-1462-417e-8f84-c80e435df790 X-Archives-Hash: b5da8d24c59e8dbb99850cff4aca94b3 commit: cdbb1f6f8bca88322e6c68fa7fc142122cd77a16 Author: Paul Zander gmail com> AuthorDate: Tue Aug 6 10:52:37 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 13 13:03:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbb1f6f dev-util/bear: 3.1.4-r1 reduce gRPC verbosity to fix bear::func_test Closes: https://bugs.gentoo.org/935788 Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37992 Signed-off-by: Joonas Niilola gentoo.org> dev-util/bear/bear-3.1.4-r1.ebuild | 1 + .../files/bear-3.1.4-reduce-grpc-verbosity.patch | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dev-util/bear/bear-3.1.4-r1.ebuild b/dev-util/bear/bear-3.1.4-r1.ebuild index 4dfcf1c91fa8..b3a0ae0c42c0 100644 --- a/dev-util/bear/bear-3.1.4-r1.ebuild +++ b/dev-util/bear/bear-3.1.4-r1.ebuild @@ -46,6 +46,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-3.1.4-tests.patch" + "${FILESDIR}/${PN}-3.1.4-reduce-grpc-verbosity.patch" ) pkg_setup() { diff --git a/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch b/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch new file mode 100644 index 000000000000..b54d1d4ccb54 --- /dev/null +++ b/dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch @@ -0,0 +1,41 @@ +From fc09623adbf4581a50b1355c27a4df849ffb18c4 Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Tue, 6 Aug 2024 12:03:17 +0200 +Subject: [PATCH] make gRPC less verbose in tests + +Bug: https://github.com/grpc/grpc/issues/37222 +Signed-off-by: Paul Zander +--- + test/cases/intercept/preload/build_stderr_captured.sh | 2 +- + test/cases/intercept/wrapper/build_stderr_captured.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/cases/intercept/preload/build_stderr_captured.sh b/test/cases/intercept/preload/build_stderr_captured.sh +index b7c7d97..47ea183 100644 +--- a/test/cases/intercept/preload/build_stderr_captured.sh ++++ b/test/cases/intercept/preload/build_stderr_captured.sh +@@ -2,7 +2,7 @@ + + # REQUIRES: preload, shell, dynamic-shell + # RUN: %{shell} %s 2> %t.orig.stderr +-# RUN: %{intercept} --output %t.json -- %{shell} %s 2> %t.fwd.stderr ++# RUN: env GRPC_VERBOSITY="ERROR" %{intercept} --output %t.json -- %{shell} %s 2> %t.fwd.stderr + # RUN: diff %t.orig.stderr %t.fwd.stderr + + >&2 $ECHO "Lorem ipsum dolor sit amet, consectetur adipiscing elit," +diff --git a/test/cases/intercept/wrapper/build_stderr_captured.sh b/test/cases/intercept/wrapper/build_stderr_captured.sh +index f99dbbc..4d2be8b 100644 +--- a/test/cases/intercept/wrapper/build_stderr_captured.sh ++++ b/test/cases/intercept/wrapper/build_stderr_captured.sh +@@ -2,7 +2,7 @@ + + # REQUIRES: shell + # RUN: %{shell} %s 2> %t.orig.stderr +-# RUN: %{intercept} --force-wrapper --output %t.json -- %{shell} %s 2> %t.fwd.stderr ++# RUN: env GRPC_VERBOSITY="ERROR" %{intercept} --force-wrapper --output %t.json -- %{shell} %s 2> %t.fwd.stderr + # RUN: diff %t.orig.stderr %t.fwd.stderr + + >&2 $ECHO "Lorem ipsum dolor sit amet, consectetur adipiscing elit," +-- +2.45.2 +