[Spice-devel] [spice-server] build-sys: Update to latest ax_valgrind_check.m4

[Frediano Ziglio]

> 
> This allows to remove a small hack in server/Makefile.am where we were
> using make check-valgrind-memcheck rather than make check-valgrind to
> make sure we get a non-0 exit code on failures.
> ---
>  m4/ax_valgrind_check.m4 | 11 +++++++++--
>  server/Makefile.am      |  5 +----
>  2 files changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4
> index 0ef29f9..1c1c0cd 100644
> --- a/m4/ax_valgrind_check.m4
> +++ b/m4/ax_valgrind_check.m4
> @@ -67,7 +67,7 @@
>  #   and this notice are preserved.  This file is offered as-is, without any
>  #   warranty.
>  
> -#serial 14
> +#serial 15
>  
>  dnl Configured tools
>  m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]])
> @@ -184,7 +184,14 @@ else
>  valgrind_lt =
>  endif
>  
> -check-valgrind: $(foreach tool,$(valgrind_enabled_tools),
> check-valgrind-$(tool))
> +# Use recursive makes in order to ignore errors during check
> +check-valgrind:
> +ifeq ($(VALGRIND_ENABLED),yes)
> +	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
> +		$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
> +else
> +	@echo "Need to reconfigure with --enable-valgrind"
> +endif
>  
>  # Valgrind running
>  VALGRIND_TESTS_ENVIRONMENT = \
> diff --git a/server/Makefile.am b/server/Makefile.am
> index 772d819..dfa0d6a 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -1,11 +1,8 @@
>  NULL =
>  SUBDIRS = . tests
>  
> -# Use 'check-valgrind-memcheck' rather than 'check-valgrind' to get a
> -# non-0 exit code on failures, see
> -# https://savannah.gnu.org/patch/index.php?9286
>  check-valgrind:
> -	$(MAKE) -C tests check-valgrind-memcheck
> +	$(MAKE) -C tests check-valgrind
>  
>  AM_CPPFLAGS =					\
>  	-DSPICE_SERVER_INTERNAL			\

This patch does not apply to master.
Maybe you have an intermediate one.

Frediano