From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 20 Jul 2017 22:03:31 +0000 (+0000)
Subject: build: add check-valgrind-* to recursive targets
X-Git-Tag: v4.19~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ed39c0fc81ac9b54e08571ce824ec96fbdb0732;p=strace

build: add check-valgrind-* to recursive targets

As make -j$N check-valgrind cannot parallelize properly, add
recursive targets for each of valgrind checks.  This way one can run
	for t in $valgrind_enabled_tools; do
		make -k check-valgrind-$n || rc=$?
	done
in $top_builddir.

* configure.ac (AM_EXTRA_RECURSIVE_TARGETS): Remove.
* m4/ax_valgrind_check.m4 (AX_VALGRIND_CHECK): Add check-valgrind
and check-valgrind-* to AM_EXTRA_RECURSIVE_TARGETS.
---

diff --git a/configure.ac b/configure.ac
index 2c84b9a7..4f5bc020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,6 @@ AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign nostdinc dist-xz silent-rules parallel-tests])
-AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4
index ea178088..c1ff1a2b 100644
--- a/m4/ax_valgrind_check.m4
+++ b/m4/ax_valgrind_check.m4
@@ -102,6 +102,7 @@ AC_DEFUN([AX_VALGRIND_CHECK],[
 
 	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
 	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
+	AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
 
 	# Check for Valgrind tools we care about.
 	[valgrind_enabled_tools=]
@@ -140,6 +141,7 @@ m4_if(m4_defn([en_dflt_valgrind_]vgtool), [off], [= "yes"], [!= "no"]),[
 			valgrind_enabled_tools="$valgrind_enabled_tools ]m4_bpatsubst(vgtool,[^exp-])["
 		])
 		AC_SUBST([ENABLE_VALGRIND_]vgtool,[$enable_valgrind_]vgtool)
+		AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)
 	])
 	AC_SUBST([valgrind_tools],["]m4_join([ ], valgrind_tool_list)["])
 	AC_SUBST([valgrind_enabled_tools],[$valgrind_enabled_tools])