From 82498bad27645c47222fa932a7caa2e95747980a Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 25 Jan 2012 12:20:17 +0100
Subject: Enable valgrind again.

---
 gl/m4/valgrind-tests.m4               |  2 +-
 gl/override/m4/valgrind-tests.m4.diff | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 gl/override/m4/valgrind-tests.m4.diff

(limited to 'gl')

diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 077e025913..6f2790ee0e 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
+  OPTS="-q --error-exitcode=1 --leak-check=full"
 
   if test -n "$VALGRIND" \
      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/gl/override/m4/valgrind-tests.m4.diff b/gl/override/m4/valgrind-tests.m4.diff
deleted file mode 100644
index d94b157b8f..0000000000
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- valgrind-tests.m4.orig
-+++ valgrind-tests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
-     AC_CHECK_PROGS(VALGRIND, valgrind)
-   fi
- 
--  OPTS="-q --error-exitcode=1 --leak-check=full"
-+  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
- 
-   if test -n "$VALGRIND" \
-      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
-- 
cgit v1.2.1