backported valgrind updates.

diff --git a/.gitignore b/.gitignore
index d286453d44c721aa9e5d0293e533391685fd6d73..eefc468fbc9e3706340e27b0a2b9e5b32c7ecc59 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -490,3 +490,72 @@ tests/x509paths/
 tests/x509self
 tests/x509sign-verify
 tests/x509signself
+doc/examples/ex-cert-select-pkcs11
+.dirstamp
+gl/signal.h
+gl/tests/inttypes.h
+gl/tests/test-accept
+gl/tests/test-bind
+gl/tests/test-close
+gl/tests/test-connect
+gl/tests/test-dup2
+gl/tests/test-fcntl-h
+gl/tests/test-fdopen
+gl/tests/test-fgetc
+gl/tests/test-float
+gl/tests/test-fputc
+gl/tests/test-fread
+gl/tests/test-fseek
+gl/tests/test-fseeko3
+gl/tests/test-fseeko4
+gl/tests/test-fstat
+gl/tests/test-ftell
+gl/tests/test-ftell3
+gl/tests/test-ftello4
+gl/tests/test-ftruncate
+gl/tests/test-fwrite
+gl/tests/test-getcwd-lgpl
+gl/tests/test-ignore-value
+gl/tests/test-intprops
+gl/tests/test-inttypes
+gl/tests/test-ioctl
+gl/tests/test-listen
+gl/tests/test-lock
+gl/tests/test-lstat
+gl/tests/test-open
+gl/tests/test-pathmax
+gl/tests/test-perror2
+gl/tests/test-pipe
+gl/tests/test-recv
+gl/tests/test-send
+gl/tests/test-setsockopt
+gl/tests/test-shutdown
+gl/tests/test-signal-h
+gl/tests/test-stat
+gl/tests/test-strerror_r
+gl/tests/test-symlink
+gl/tests/test-sys_types
+gl/tests/test-sys_uio
+gl/tests/test-thread_create
+gl/tests/test-thread_self
+lib/gl/tests/inttypes.h
+lib/gl/tests/test-fcntl-h
+lib/gl/tests/test-fdopen
+lib/gl/tests/test-fgetc
+lib/gl/tests/test-float
+lib/gl/tests/test-fputc
+lib/gl/tests/test-fread
+lib/gl/tests/test-fseek
+lib/gl/tests/test-fseeko3
+lib/gl/tests/test-fseeko4
+lib/gl/tests/test-fstat
+lib/gl/tests/test-ftell
+lib/gl/tests/test-ftell3
+lib/gl/tests/test-ftello4
+lib/gl/tests/test-fwrite
+lib/gl/tests/test-intprops
+lib/gl/tests/test-inttypes
+lib/gl/tests/test-sys_types
+lib/gl/tests/test-sys_uio
+tests/rng-fork
+tests/x509cert

diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index ab9e25a841b3ef9a1d4df41edfdda4a985ea45c4..9c4d0290c6b3b8889786eb288662f7c1bf92e6c8 100644 (file)
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
 
   if test -n "$VALGRIND" && $VALGRIND -q true > /dev/null 2>&1; then
     opt_valgrind_tests=yes
-    VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=full"
+    VALGRIND="$VALGRIND -q --error-exitcode=1 --suppressions=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
new file mode 100644 (file)
index 0000000..dac9a24
--- /dev/null
+++ b/gl/override/m4/valgrind-tests.m4.diff
@@ -0,0 +1,11 @@
+--- valgrind-tests.m4.orig     2011-05-21 09:37:17.415555504 +0200
++++ valgrind-tests.m4  2011-05-21 09:37:34.600259721 +0200
+@@ -23,7 +23,7 @@
+ 
+   if test -n "$VALGRIND" && $VALGRIND -q true > /dev/null 2>&1; then
+     opt_valgrind_tests=yes
+-    VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=full"
++    VALGRIND="$VALGRIND -q --error-exitcode=1 --suppressions=suppressions.valgrind"
+   else
+     opt_valgrind_tests=no
+     VALGRIND=

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dfebc066503aae496af74ae38d6a8e2c96a66f8b..53012fac70465fcd21c7d96dbfc7d83b1c54699f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ if WANT_TEST_SUITE
 SUBDIRS += suite
 endif
 
-EXTRA_DIST = libgcrypt.supp eagain-common.h
+EXTRA_DIST = suppressions.valgrind eagain-common.h
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \

diff --git a/tests/safe-renegotiation/Makefile.am b/tests/safe-renegotiation/Makefile.am
index 8b0c65833aaeac8bd7e480b078f462b3e08be163..17d4684df7143761a02d53daa1f2d6cc91ca48a6 100644 (file)
--- a/tests/safe-renegotiation/Makefile.am
+++ b/tests/safe-renegotiation/Makefile.am
@@ -32,4 +32,4 @@ check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
 TESTS_ENVIRONMENT = $(VALGRIND)
 
-EXTRA_DIST = README
+EXTRA_DIST = README suppressions.valgrind

diff --git a/tests/safe-renegotiation/suppressions.valgrind b/tests/safe-renegotiation/suppressions.valgrind
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/libgcrypt.supp b/tests/suppressions.valgrind
similarity index 100%
rename from tests/libgcrypt.supp
rename to tests/suppressions.valgrind