valgrind: support separate builddir for suppressions.valgrind

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

diff --git a/.gitignore b/.gitignore
index 637b9735bc9259b6a1e8439c7c9c8b8787f36714..97a353b51460a5b406383ff913702fe1cd1855a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -607,7 +607,6 @@ src/tpmtool
 src/tpmtool-args.c
 src/tpmtool-args.h
 stamp-h1
-suppressions.valgrind
 tags
 tests/*/out
 tests/Makefile

diff --git a/configure.ac b/configure.ac
index a14aa8fe466b71705577e1ea7f1bd10924d1f337..cbe16858bb608730e97704aef18d5857084ce32b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,6 @@ AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`)
 AC_SUBST(PATCH_VERSION, [[`echo $PACKAGE_VERSION | sed 's/.*\..*\.\([0-9]*\).*/\1/g'`]])
 AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION`)
 
-touch suppressions.valgrind
 dnl C and C++ capabilities
 AC_C_INLINE
 AC_HEADER_STDC

diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 2abae39a37852acb3149c063d4c3e2d8c53b8eca..d694f26cd3280375776194e4fe9a89a5338180a9 100644 (file)
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -21,12 +21,12 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  OPTS="-q --error-exitcode=6 --leak-check=full --suppressions=suppressions.valgrind"
+  OPTS="-q --error-exitcode=6 --leak-check=full"
 
   if test -n "$VALGRIND" \
      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
     opt_valgrind_tests=yes
-    VALGRIND="$VALGRIND $OPTS"
+    VALGRIND="$VALGRIND $OPTS --suppressions=\$(srcdir)/suppressions.valgrind"
   else
     opt_valgrind_tests=no
     VALGRIND=

diff --git a/gl/override/m4/valgrind-tests.m4.diff b/gl/override/m4/valgrind-tests.m4.diff
index c836d6740861f07ba4a8d516be859b92ec47f8d1..eb1087d5cd34d0c12a923e357e00b03afbdfdcaf 100644 (file)
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ b/gl/override/m4/valgrind-tests.m4.diff
@@ -1,11 +1,11 @@
 --- 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=6 --leak-check=full --suppressions=suppressions.valgrind"
- 
+@@ -26,7 +26,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
    if test -n "$VALGRIND" \
       && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
+     opt_valgrind_tests=yes
+-    VALGRIND="$VALGRIND $OPTS"
++    VALGRIND="$VALGRIND $OPTS --suppressions=\$(srcdir)/suppressions.valgrind"
+   else
+     opt_valgrind_tests=no
+     VALGRIND=