diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2015-03-27 09:45:23 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2015-03-27 09:45:23 +0000 |
| commit | 445567847911dafc8807d72851adc82e8f50cbfb (patch) | |
| tree | 36f8711700c5bbe07deb3fae31641345d440d505 /app-admin/rsyslog | |
| parent | Version bump. Adds location for applications to install symbolic app icons th... (diff) | |
| download | gentoo-2-445567847911dafc8807d72851adc82e8f50cbfb.tar.gz gentoo-2-445567847911dafc8807d72851adc82e8f50cbfb.tar.bz2 gentoo-2-445567847911dafc8807d72851adc82e8f50cbfb.zip | |
fix valgrind failing test
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'app-admin/rsyslog')
3 files changed, 65 insertions, 2 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index 2ed5945924f0..dacacf535359 100644 --- a/app-admin/rsyslog/ChangeLog +++ b/app-admin/rsyslog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/rsyslog # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.135 2015/03/26 15:17:05 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.136 2015/03/27 09:45:23 ultrabug Exp $ + + 27 Mar 2015; Ultrabug <ultrabug@gentoo.org> rsyslog-8.7.0-r2.ebuild, + +files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench. + patch: + disable failing valgrind test by Thomas D. *rsyslog-8.7.0-r2 (26 Mar 2015) diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch new file mode 100644 index 000000000000..77d7919c6188 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch @@ -0,0 +1,56 @@ +From 2945539d12bbb79c44fd4402e87150b4ec58af25 Mon Sep 17 00:00:00 2001 +From: Thomas D. +Date: Tue, 24 Mar 2015 02:03:13 +0100 +Subject: [PATCH] Add option to disable valgrind usage in testbench + +Temporary workaround for https://github.com/rsyslog/rsyslog/issues/263 + +--- + configure.ac | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0c72f80..cdfdd25 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,10 +13,6 @@ AC_CONFIG_HEADERS([config.h]) + + AC_USE_SYSTEM_EXTENSIONS + +-# check if valgrind is present +-AC_CHECK_PROG(have_valgrind, [valgrind], [yes]) +-AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes) +- + # Checks for programs. + AC_PROG_LEX + AC_PROG_YACC +@@ -1125,6 +1121,29 @@ if test "x$enable_testbench" = "xyes"; then + fi + + ++# valgrind-testbench ++AC_ARG_WITH([valgrind_testbench], ++ [AS_HELP_STRING([--without-valgrind-testbench], [Don't use valgrind in testbench])] ++) ++ ++if test "x$with_valgrind_testbench" != "xno"; then ++ AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no]) ++ ++ if test "x$enable_testbench" = "xyes" && test "x$VALGRIND" = "xno"; then ++ if test "x$with_valgrind_testbench" = "xyes"; then ++ AC_MSG_ERROR([valgrind is missing but forced with --with-valgrind-testbench. Either install valgrind or remove the option!]) ++ else ++ AC_MSG_WARN([valgrind is missing -- testbench won't use valgrind!]) ++ fi ++ else ++ AC_MSG_NOTICE([testbench will use valgrind]) ++ fi ++else ++ AC_MSG_NOTICE([testbench won't use valgrind due to set --without-valgrind-testbench option]) ++fi ++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$with_valgrind_testbench" != "xno" && test "x$VALGRIND" != "xno"]) ++ ++ + # settings for the file input module + AC_ARG_ENABLE(imfile, + [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])], diff --git a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild index f2edd509ab34..b7da0dc7c9f3 100644 --- a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.1 2015/03/26 15:17:05 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.2 2015/03/27 09:45:23 ultrabug Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -37,6 +37,7 @@ else PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-run-queue-persist-test-only-once.patch ) PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-fix-size-based-legacy-config-statements.patch ) + PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" @@ -142,6 +143,7 @@ src_configure() { local myeconfargs=( --disable-generate-man-pages + --without-valgrind-testbench $(use_enable test testbench) # Input Plugins without depedencies --enable-imdiag |