From patchwork Tue Sep 26 00:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114205 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3199659qgf; Mon, 25 Sep 2017 17:02:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAZKa2pFwXG8XRJ4RvF4jWJbu7G4wp88uXOfGv/fZxW/xMvu4ym/beg/UOfyGWSGznUw7HK X-Received: by 10.237.62.129 with SMTP id n1mr13668233qtf.39.1506384162361; Mon, 25 Sep 2017 17:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506384162; cv=none; d=google.com; s=arc-20160816; b=t/YlreDMVL+8G6tLE2vp7hy75hubEYxa/ndYdUE5rmsuZhk1s0bdHFmoZa/YjiAaoM q2/CkQkVgjxgV4QeTmmuByXRh2fNFJVMEfuIGrEQj+CxtjnmUvhwhjBldjTVH+cBCkYL J1X91YuUB61+4+FAm6eYYkUVnAsWR1GnBiYL+E8V0uTSq6GOvIROCyw1tnhFbTza4Z06 mXersmpQpqEPmtbycJpiI/aqfRXfOOKHDpQpWsTsBiGlgdc3ltkBzrpTDPbAWNQ88ExC Am7yohUvKBoUDRYJQOXMCKYsEHnOE2PlLrHtmeTaq7LD1W3yFqjzJO7zWFObySHWjUlA AmGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=cpvU1fCM5xB1QOHlIRUIypUUoQmvjegjtkGuQx18uKU=; b=xnbgyrRSJt3SNgCP/+qSd4SesT8zodSSsxcOIRyN7EeG2k7r4u2aXiaYR5VSR37UjK 87YWbWok6+x4GKEl+R5RVA9+Lx2AHtwKwo3v4UIC941EifO1STFuQ0WP+H+O3x+l9tkO A6ZUDmhB3eNQYiTYcIYYR3sLA3Q+Q7cWwgqdz76cs2i7/bfwfcSZIgzZtz3JTJzxFjXr toxTaUh7O+shHhd/wAKqgGB8loQH9gfRkzjxCozaHMnA16k+NGadI2us6RRpluGapFgb L5tuQne9Hj0thy70wJIYmaqudQJXW6OK7LPxcQe+ew0eqkZA+BdR2WA9lxyZRF03ZIZ0 fttQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t8si3426474qtg.264.2017.09.25.17.02.42; Mon, 25 Sep 2017 17:02:42 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A810060CA9; Tue, 26 Sep 2017 00:02:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id DA9A660BF2; Tue, 26 Sep 2017 00:01:12 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 97CD260A4A; Tue, 26 Sep 2017 00:01:01 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id F1D8560AEF for ; Tue, 26 Sep 2017 00:00:25 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward101j.mail.yandex.net (Yandex) with ESMTP id A54751243ECC for ; Tue, 26 Sep 2017 03:00:24 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id X6jt7DHKk8-0OemnIds; Tue, 26 Sep 2017 03:00:24 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id glDVzNKVtz-0NLOeevG; Tue, 26 Sep 2017 03:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 26 Sep 2017 03:00:05 +0300 Message-Id: <1506384005-31536-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506384005-31536-1-git-send-email-odpbot@yandex.ru> References: <1506384005-31536-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 194 Subject: [lng-odp] [PATCH v1 3/3] ax_valgrind_check: run check-valgrind recursively X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Switch check-valgrind and check-valgrind-$TOOL into recursive Automake targets. It is still required to put @VALGRIND_CHECK_RULES@ into each directory with tests, but it is now possible to run `make check-valgrind' from top-level directory. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 194 (lumag:fix-valgrind) ** https://github.com/Linaro/odp/pull/194 ** Patch: https://github.com/Linaro/odp/pull/194.patch ** Base sha: 886e54149d3ee64e56c422a0d3dd7c536e2b4b7d ** Merge commit sha: fd2d7d25fd5c26b2cb36874c7b94567ab1a7bf1e **/ m4/ax_valgrind_check.m4 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4 index 1c1c0cd4b..d9a8ce1bd 100644 --- a/m4/ax_valgrind_check.m4 +++ b/m4/ax_valgrind_check.m4 @@ -79,6 +79,10 @@ AC_DEFUN([AX_VALGRIND_DFLT],[ m4_define([en_dflt_valgrind_$1], [$2]) ])dnl +AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) +m4_foreach([vgtool], [valgrind_tool_list], + [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)]) + AC_DEFUN([AX_VALGRIND_CHECK],[ dnl Check for --enable-valgrind AC_ARG_ENABLE([valgrind], @@ -175,7 +179,7 @@ valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY)) valgrind_quiet_0 = --quiet valgrind_v_use = $(valgrind_v_use_$(V)) valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY)) -valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%,%,$''@):; +valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%-am,%,$''@):; # Support running with and without libtool. ifneq ($(LIBTOOL),) @@ -185,7 +189,7 @@ valgrind_lt = endif # Use recursive makes in order to ignore errors during check -check-valgrind: +check-valgrind-am: ifeq ($(VALGRIND_ENABLED),yes) $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) @@ -205,13 +209,15 @@ VALGRIND_LOG_COMPILER = \ $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) define valgrind_tool_rule = -check-valgrind-$(1): +check-valgrind-$(1)-am: ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) +ifneq ($$(TESTS),) $$(valgrind_v_use)$$(MAKE) check-TESTS \ TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \ LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \ LOG_FLAGS="$$(valgrind_$(1)_flags)" \ TEST_SUITE_LOG=test-suite-$(1).log +endif else ifeq ($$(VALGRIND_ENABLED),yes) @echo "Need to reconfigure with --enable-valgrind-$(1)" else