From 22f36ffbbd0c4e0fe1bfe331cb7ca15ec6ae80aa Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 9 Mar 2011 08:23:16 +0100
Subject: testbench: valgrind tests only executed if valgrind is available

---
 configure.ac            | 4 ++++
 tests/Makefile.am       | 8 ++++++--
 tests/imtcp_conndrop.sh | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 278288e7..a7d26a1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,10 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_GNU_SOURCE
 
+# check if valgrind is present
+AC_CHECK_PROG(have_valgrind, [valgrind], [yes])
+AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes)
+
 # check for Java compiler
 AC_CHECK_PROG(HAVE_JAVAC, [javac], [yes])
 if test x"$HAVE_JAVAC" = x""; then
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3e07e1c6..7527b27f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,6 @@ TESTS = $(TESTRUNS) cfg.sh \
 	rulesetmultiqueue.sh \
 	manytcp.sh \
 	rsf_getenv.sh \
-	tcp-msgreduc-vg.sh \
 	imtcp_conndrop.sh \
 	imtcp_addtlframedelim.sh \
 	sndrcv.sh \
@@ -49,10 +48,15 @@ TESTS = $(TESTRUNS) cfg.sh \
 	imuxsock_traillf_root.sh \
 	imuxsock_ccmiddle_root.sh \
 	discard-rptdmsg.sh \
-	discard-rptdmsg-vg.sh \
 	discard.sh \
 	queue-persist.sh 
 
+if HAVE_VALGRIND
+TESTS +=  \
+	discard-rptdmsg-vg.sh \
+	tcp-msgreduc-vg.sh
+endif
+
 if ENABLE_IMPTCP
 TESTS +=  \
 	manyptcp.sh \
diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh
index 9855ee3b..c7eb89e8 100755
--- a/tests/imtcp_conndrop.sh
+++ b/tests/imtcp_conndrop.sh
@@ -9,7 +9,7 @@ source $srcdir/diag.sh init
 source $srcdir/diag.sh startup imtcp_conndrop.conf
 # 100 byte messages to gain more practical data use
 source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D
-sleep 4 # due to large messages, we need this time for the tcp receiver to settle...
+sleep 6 # due to large messages, we need this time for the tcp receiver to settle...
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
 source $srcdir/diag.sh wait-shutdown       # and wait for it to terminate
 source $srcdir/diag.sh seq-check 0 49999 -E
-- 
cgit