commit: cdbb1f6f8bca88322e6c68fa7fc142122cd77a16 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Tue Aug 6 10:52:37 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37992 Signed-off-by: Joonas Niilola <juippis <AT> 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 <[email protected]> +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 <[email protected]> +--- + 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 +
