From patchwork Wed Sep 27 00:00:06 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: 114301 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4414213qgf; Tue, 26 Sep 2017 17:01:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDR27GRTYcQ1F7TXH36P7+H4b7VbPTJ170Y8FlbkaPEPOwnWCgXW9Xjw3ZDw3WJ7vt4Sa5Q X-Received: by 10.36.44.76 with SMTP id i73mr89768iti.146.1506470491585; Tue, 26 Sep 2017 17:01:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506470491; cv=none; d=google.com; s=arc-20160816; b=B1dnM+hEmUfavEgA6u6+mJumCXBAssirXFx4bqHJtaRQiqExVejIRtXuy64b97jFJ+ qZPmgM1qNOE1kjioZ2aF50ArX1M2EWH1LHVY8yHhUZt7/j8Ec61AMQFAeVz8SGt/qfFp 9HaMx+s6y+mEvOXHfyxAvpUCGseBmpKT6lOc5stGr46AeIxVCeB2a/HWtqBj10cNY+K4 KVzQNghI7NcseH0ezh7XUI7hOdSTQAf6jYfPGxrV/6npsL/62xaBo3zcmTBhrOQnRuWp lmbKTQTVZH+N2stkyte+ZgwV+BvRajqdx7Vh7lMoJOIjyTSPhyvWTnXNaN+HYLKdzsWt x4VQ== 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=AinDVCzBzHDV+6vOLyG6fsnh7ecqj+hQ8BCVR6/niAY=; b=IEzpKfaM6TyxlRIioXtGRdybhLw2sAWRUjX87OocanW/IwvvXYAC3RzUIfiy7VYeK7 hk5Edx+FHn9IV+r2L//ncTQXZ4kfyQ93IqEsr/iZ76korT6/KRlgWZUyEJx2Vzg4mgPr jIEvFzVUQLQdOJP2erpID1iqdd3hwdt66/8BPWAr9rL8e2Cy94S85bIt2XUQzRCV7Rwo 9vAYgDyK81z49VveqHscgR/wVXhytck+TgBZpwIT6bbUDfIdfJEeqJABc+pnIPDmKUQd 7YZHR9ilN0FsSIEKcQT0TWjbwttjEGolzP8HD1ZPLdoVh0PrIxeRPABaYjPW3BM13ipm 1E+Q== 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 p200si3027632itb.7.2017.09.26.17.01.31; Tue, 26 Sep 2017 17:01:31 -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 EF01860A1A; Wed, 27 Sep 2017 00:01:30 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 F385E60A54; Wed, 27 Sep 2017 00:00:55 +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 6EA5960929; Wed, 27 Sep 2017 00:00:51 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 9EA5F60A54 for ; Wed, 27 Sep 2017 00:00:26 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 28F10704724 for ; Wed, 27 Sep 2017 03:00:25 +0300 (MSK) Received: from smtp4p.mail.yandex.net (smtp4p.mail.yandex.net [2a02:6b8:0:1402::15:6]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FD3XzBReoB-0PWumRCf; Wed, 27 Sep 2017 03:00:25 +0300 Received: by smtp4p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fnf01nnYHe-0O4m98HS; Wed, 27 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: Wed, 27 Sep 2017 03:00:06 +0300 Message-Id: <1506470406-650-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506470406-650-1-git-send-email-odpbot@yandex.ru> References: <1506470406-650-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 194 Subject: [lng-odp] [PATCH v2 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: f025da7131d921a4207b31bd5af4490da9b0ef24 ** Merge commit sha: c179cdfd8f68c78f05717f5f3985679e749893bb **/ m4/ax_valgrind_check.m4 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4 index 1c1c0cd4b..36441a830 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)) @@ -204,14 +208,16 @@ VALGRIND_LOG_COMPILER = \ $(valgrind_lt) \ $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) -define valgrind_tool_rule = -check-valgrind-$(1): +define valgrind_tool_rule +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