summaryrefslogtreecommitdiff
path: root/dev-util/bear
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/bear')
-rw-r--r--dev-util/bear/Manifest3
-rw-r--r--dev-util/bear/bear-3.1.4-r1.ebuild3
-rw-r--r--dev-util/bear/files/bear-3.1.4-reduce-grpc-verbosity.patch41
3 files changed, 45 insertions, 2 deletions
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index dc8cd3964ff9..479bfc4932cd 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,7 +1,8 @@
+AUX bear-3.1.4-reduce-grpc-verbosity.patch 1813 BLAKE2B 3a4e3faca382d3994bc94e5a3aa95c2d44f255fae95383068d44cc2347323508690451759533e01ebe2845235e7de0e37b1bf1f80aa9adbfe73c2b3a9546460d SHA512 58a1831c763565d443c7fad6b752640706176b19edd4d1fff67d74aecf5a3fb86d91d969b60c6d926deacb18771b9e5e5b00eb791dee45648ae709ccbe9d05ff
AUX bear-3.1.4-tests.patch 2199 BLAKE2B 2f2c97705aec1d55e6166cb13858d3e6eda3cc44e9de0fdff9a9c452a71790542534bcb0740f28e47e061405eaf9e180cca49c12232fef8b63107a3e0fde1166 SHA512 89451e19647064fcbe7c31c328d0eddf33882a4a5b94903bc6e89b24bbfe30f2152afc813c40c0ae5aeb0909e0c9f7e190e21b7d9505b05c9f52741a35525f51
DIST bear-3.1.3.tar.gz 127766 BLAKE2B 8fdb5b9bf8e1e026df2296b0d45f23ce1a9157dda28b2656d36c0799e2f02965711ecdf09780d075e18965afc6a771dbf26501e9e1e3b26f4784d4191e168748 SHA512 34039b51a7cd636bdb7fb716f69d6c70de3e7bfc5e2c83a3040942010fb7effe49b0afa0d29be182eb550d57b024fbe5bea779a7fda5f86201865bf491ba1672
DIST bear-3.1.4.tar.gz 127672 BLAKE2B 18deb1172fcd8afdf4721a04b5d72b182190afd92d645841023033d187c812a0a30805af2bfb67b794ab8a8f0ca42965bebab6d035e95e2a25c5fccfe48a1afd SHA512 c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98
EBUILD bear-3.1.3.ebuild 2294 BLAKE2B 567743514d620a381e558bc5f4f6af3d95bdcb16d5aa055002c9777fb349538a68a81bac5bbc95972f70b992aa3367df4ccd52ca6fbb849b4937f271a6b7fed2 SHA512 bfec90ac915f5af0a1d43239ea1234e407991a1841490630f988e12279147afe78316ca212ddf9eec864bd99ecda431169a0d52e24a70791ceb6a4b7fc3a011e
-EBUILD bear-3.1.4-r1.ebuild 2671 BLAKE2B fe26bda46cd964c8e112426fb40b3109349e7001784d440b269843d5a45bbedd02aca00797d4f2f5154e3d038a19c63e30d213c6dd57aaf254296891791770a5 SHA512 db6d7b29fb7fab792544ef5c82fab43c537e26355026c625bfdad78f9654b68d3e0315d6a3a7f85490a91637c16fbb68fe250a9a54d72ecac3816d7053050557
+EBUILD bear-3.1.4-r1.ebuild 2724 BLAKE2B f214d7b91b6e92c9586acfb15eeb4a7025343b1bd533c486c40a723a37a98bbc1c198e2de9d05145f327aac3e1b877d4ee6fa119b24176128881652df584ae49 SHA512 91421997afc187deedb3ce27469fd7ecac5b399734f1d7c405f9e355ed9282e51cad6e86ac12acc462a71a4519d226cacc273b87a3c92eb0cd5d362b6ddcbd8c
EBUILD bear-3.1.4.ebuild 2294 BLAKE2B 931a5a1da0c5dabab6507e3f2ad2cb43d1f711358dbbd6772ac3b4d907715ebed380a8da34be723ace83d2e955792d03204ae0af05cf5dbe7d790f335c8473e4 SHA512 0da412c2b77dc6a3f6102046ca27e1a4151b85c8438c401d2f2ecae6427ddf34229298befb8459bb2056d7d8571287b1e8cc7f68c7119cc01ef65e080aa1d69a
MISC metadata.xml 1067 BLAKE2B 180de420c2173d245fa29b092d80e2c94ae2df8ba5c1c9d3fa2d706c75fbbc489d08b61505bf612fe247b7a9384b220682549f47db77b8bc3e7b170be9663380 SHA512 df9e220346c2098767bafc1e212a94fedae90892de64d8f04c599f3caf124d3ab539a9d9f757b5ba5ed4ff895fa39b954409d551514c9ee6fe44296c2317a021
diff --git a/dev-util/bear/bear-3.1.4-r1.ebuild b/dev-util/bear/bear-3.1.4-r1.ebuild
index d573a78f9b17..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() {
@@ -104,7 +105,7 @@ src_test() {
fi
mylitopts+=(-j "$(makeopts_jobs)" )
- [[ -n "${LIT_SKIP_TESTS[*]}" ]] && mylitopts+=( --filter-out "($( IFS='|'; echo "${CMAKE_SKIP_TESTS[*]}"))" )
+ [[ -n "${LIT_SKIP_TESTS[*]}" ]] && mylitopts+=( --filter-out "($( IFS='|'; echo "${LIT_SKIP_TESTS[*]}"))" )
export LIT_OPTS="${mylitopts[*]}"
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 <negril.nx+gentoo@gmail.com>
+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 <negril.nx+gentoo@gmail.com>
+---
+ 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
+