summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2021-03-15 12:47:36 +0000
committerDaiki Ueno <ueno@gnu.org>2021-03-15 12:47:36 +0000
commit1def7f23104bd9160fc8373c2e5513ec9192e48f (patch)
tree59fdba4436c8d43d6f9e8afaf1ff6193d9be407a
parentc95312c5831be5418dc02a86d72bcd1eafd4c145 (diff)
parent9d60d6ae4d5d3a6764ebf5f68d164456d50a5610 (diff)
downloadgnutls-1def7f23104bd9160fc8373c2e5513ec9192e48f.tar.gz
Merge branch 'wip/dueno/tzalloc-tests' into 'master'
gnulib: update git submodule Closes #1190 See merge request gnutls/gnutls!1402
-rw-r--r--gl/override/m4/valgrind-tests.m4.diff22
m---------gnulib0
2 files changed, 12 insertions, 10 deletions
diff --git a/gl/override/m4/valgrind-tests.m4.diff b/gl/override/m4/valgrind-tests.m4.diff
index 4e31532e75..95351fa361 100644
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ b/gl/override/m4/valgrind-tests.m4.diff
@@ -1,6 +1,8 @@
---- valgrind-tests.m4 2018-05-25 10:11:51.767309109 +0200
-+++ valgrind-tests.m4.gnutls 2018-05-25 10:20:02.999088040 +0200
-@@ -12,9 +12,9 @@
+diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
+index 50d90e145..5e198b455 100644
+--- a/m4/valgrind-tests.m4
++++ b/m4/valgrind-tests.m4
+@@ -12,9 +12,9 @@ dnl From Simon Josefsson
AC_DEFUN([gl_VALGRIND_TESTS],
[
AC_ARG_ENABLE([valgrind-tests],
@@ -13,12 +15,12 @@
# Run self-tests under valgrind?
if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
-@@ -23,7 +23,7 @@
- if test "$VALGRIND"; then
+@@ -45,7 +45,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
+ if test -n "$VALGRIND"; then
AC_CACHE_CHECK([for valgrind options for tests],
[gl_cv_opt_valgrind_tests],
-- [gl_cv_opt_valgrind_tests="-q --error-exitcode=1 --leak-check=full"
-+ [gl_cv_opt_valgrind_tests="-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind"
- $VALGRIND $gl_valgrind_opts ls > /dev/null 2>&1 ||
- gl_cv_opt_valgrind_tests=no])
-
+- [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full'
++ [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind'
+ if $VALGRIND $gl_valgrind_opts ls > /dev/null 2>&1; then
+ gl_cv_opt_valgrind_tests="$gl_valgrind_opts"
+ else
diff --git a/gnulib b/gnulib
-Subproject b29d62dfaf8c55b18e9c8f30322a9bcde5255cb
+Subproject 257183ec1ea1517d5ae6dac2e8724a90e23e864