app-admin/rsyslog: skip omfwd_fast_imuxsock when running without dev-libs/liblogging[stdlog]

Bug: https://bugs.gentoo.org/819087
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
This commit is contained in:
Thomas Deutschmann
2021-10-21 17:18:49 +02:00
parent 73be720f79
commit 1fb5670d27
2 changed files with 33 additions and 4 deletions

View File

@@ -0,0 +1,29 @@
From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 19 Oct 2021 23:00:50 +0200
Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog
is not available
Fixes #4712
---
tests/omfwd_fast_imuxsock.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh
index bb35b58d18..10f9f19c18 100755
--- a/tests/omfwd_fast_imuxsock.sh
+++ b/tests/omfwd_fast_imuxsock.sh
@@ -4,6 +4,13 @@
. ${srcdir:=.}/diag.sh init
skip_platform "SunOS" "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS"
+./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1
+no_liblogging_stdlog=$?
+if [ $no_liblogging_stdlog -ne 0 ];then
+ echo "liblogging-stdlog not available - skipping test"
+ exit 77
+fi
+
# export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
export NUMMESSAGES=100000

View File

@@ -97,10 +97,8 @@ RDEPEND="
zeromq? (
>=net-libs/czmq-4:=[drafts]
)"
DEPEND="${RDEPEND}
test? (
>=dev-libs/liblogging-1.0.1[stdlog]
)"
DEPEND="${RDEPEND}"
if [[ ${PV} == "9999" ]]; then
BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -109,6 +107,8 @@ if [[ ${PV} == "9999" ]]; then
BDEPEND+=" >=dev-python/docutils-0.12"
fi
PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch )
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"