Removed the test suite's valgrind handling in favor of the generic implementation Dovecot provides.

.gitignore

@@ -45,6 +45,7 @@ Makefile.in
 src/**/test-*
 !src/**/test-*.c
 !src/**/test-*.h
+**/test.out.*
 
 doc/man/doveadm-sieve.1
 doc/man/sievec.1

Makefile.am

@@ -47,12 +47,7 @@ DISTCLEANFILES = \
 
 TESTSUITE_BIN = $(top_builddir)/src/testsuite/testsuite $(TESTSUITE_OPTIONS)
 
-if TESTSUITE_VALGRIND
-TEST_BIN = libtool --mode=execute valgrind -q --error-exitcode=1 \
-	--show-reachable=yes --leak-check=full --trace-children=yes $(TESTSUITE_BIN)
-else
-TEST_BIN = $(TESTSUITE_BIN)
-endif
+TEST_BIN = $(RUN_TEST) $(TESTSUITE_BIN)
 
 if BUILD_UNFINISHED
 test_unfinished =

configure.ac

@@ -99,16 +99,6 @@ AC_ARG_WITH(docs,
     want_docs=yes)
 AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes")
 
-AC_ARG_ENABLE(valgrind,
-[AC_HELP_STRING([--enable-valgrind], [Enable Valgrind memory leak checks in testsuite [default=no]])],
-    if test x$enableval = xno || test x$enableval = xauto; then
-        want_valgrind=$enableval
-    else
-        want_valgrind=yes
-    fi,
-    want_valgrind=no)
-AM_CONDITIONAL(TESTSUITE_VALGRIND, test "$want_valgrind" = "yes")
-
 AC_ARG_WITH(managesieve,
 [AC_HELP_STRING([--with-managesieve],
 	[Build ManageSieve service [default=yes]])],

dovecot-pigeonhole.m4

 # pigeonhole.m4 - Check presence of pigeonhole -*-Autoconf-*-
 #.
 
-# serial 4
+# serial 5
 
 AC_DEFUN([DC_PIGEONHOLE],[
 	AC_ARG_WITH(pigeonhole,
@@ -55,16 +55,6 @@ AC_DEFUN([DC_PIGEONHOLE],[
 
 	pigeonhole_incdir="$pigeonholedir"
 
-	AC_ARG_ENABLE(valgrind,
-	[AC_HELP_STRING([--enable-valgrind], [Enable Valgrind memory leak checks in testsuite [default=no]])],
-	    if test x$enableval = xno || test x$enableval = xauto; then
-    	    want_valgrind=$enableval
-	    else
-    	    want_valgrind=yes
-	    fi,
-	want_valgrind=no)
-	AM_CONDITIONAL(PIGEONHOLE_TESTSUITE_VALGRIND, test "$want_valgrind" = "yes")
-
 	AC_SUBST(pigeonhole_incdir)
 
 	AC_SUBST(LIBSIEVE_INCLUDE)