diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2017-01-20 23:12:36 +0200 |
|---|---|---|
| committer | Alon Bar-Lev <alon.barlev@gmail.com> | 2017-01-23 20:51:36 +0200 |
| commit | 4beb7d97a748e0a90cfb413670a55f47e47d2f06 (patch) | |
| tree | 6f769d99afd4f9b5720dc10b25352e6551b034ae | |
| parent | 9a75d3e4efc00522df7e021da66e48b02d1c8b1a (diff) | |
| download | gnutls-4beb7d97a748e0a90cfb413670a55f47e47d2f06.tar.gz | |
valgrind: support separate builddir for suppressions.valgrind
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gl/m4/valgrind-tests.m4 | 4 | ||||
| -rw-r--r-- | gl/override/m4/valgrind-tests.m4.diff | 14 |
4 files changed, 9 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 637b9735bc..97a353b514 100644 --- 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 a14aa8fe46..cbe16858bb 100644 --- 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 2abae39a37..d694f26cd3 100644 --- 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 c836d67408..eb1087d5cd 100644 --- 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= |