[Spice-commits] m4/ax_valgrind_check.m4 server/Makefile.am

[Frediano Ziglio]

 m4/ax_valgrind_check.m4 |    7 +++----
 server/Makefile.am      |    5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 68bc284b5222db79b404e16b2ee5df79ff092820
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Mar 22 10:20:52 2017 +0100

    build-sys: Update to latest ax_valgrind_check.m4
    
    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.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4
index 3761fd5e..1c1c0cd4 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]])
@@ -187,9 +187,8 @@ endif
 # Use recursive makes in order to ignore errors during check
 check-valgrind:
 ifeq ($(VALGRIND_ENABLED),yes)
-	-$(A''M_V_at)$(foreach tool,$(valgrind_enabled_tools), \
-		$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-$(tool); \
-	)
+	$(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
diff --git a/server/Makefile.am b/server/Makefile.am
index 772d8197..dfa0d6a7 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			\