From patchwork Mon Sep 11 19: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: 112226 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4218083qgf; Mon, 11 Sep 2017 12:13:53 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB1wNRiuhNRNwX0gEGK1Kg+/zp8tFtQbmVhMOQZ1qQ+5DM6PHU7uRqWrI/wtikPaPNOgB5p X-Received: by 10.200.56.124 with SMTP id r57mr18483719qtb.172.1505157233373; Mon, 11 Sep 2017 12:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505157233; cv=none; d=google.com; s=arc-20160816; b=UtLUeb0nBcqglWITfYiUoFVk7jI9q97MiCyPvjSlWrDssGYqoPVdZ1Q3yiJVvzaw4E lrhrpq53Lwg6aXjB7DRHNPw3LSxdZwaBxziSIajHpwKm6UfrNXgjJbJbyGGu6Swq0YeS xeBXfeHMhEzmO84OvRsjQivJ5gilRsWQVFZNhOP+Tr66kqh/2S2AGQJ4mMgZYbIzvI32 PV0s5hV2xm27j5O2eoZv7XybKW14RY1Kw0xRk0gDmK5eHie2MlcgQ5ulYhVA82jgelcV y0ECNkyPxv+3QC28hNen6ROvotf5l1W4qa5tyJoFnZFuQb4c8LGDyltVbLkyJVvB00Qm Q1mg== 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=tHvDFWNP1BitQM8Umws5s9FiObSAZvB9hPX5sMDT7No=; b=j0GEdXHhPC7vHcS89ZDd1q84fRlVNzaWJifh38g+zBK7btebVdO8xukdg2fm7dGdoK kQ+XEMF7IZoI0G63XExmIMR5arL+Jc1Aj5Fm4rnmhKzZA98iWXdpPlCpljZTVvc1LgGt xBve0H3h7SozN59AKZrl52A2Bkb0r0FnlguqSvpvDKRwIvLOaN+RW15ZEsOqAn3o5NpR KjDZOygdVbCufaeXnWylsaW4R2aeCbReikGXVp7JnrEuQ+1lrurfJ3sc4TmAVUonJYe7 /1FrPRCdjLIDdITEJTpJQSZb/XrCNqhF/JEpj9F0TJJnwMpTuhFjaT1U3jg6rHGfuaPE hMog== 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 l27si10513653qta.36.2017.09.11.12.13.53; Mon, 11 Sep 2017 12:13:53 -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 0105061056; Mon, 11 Sep 2017 19:13:52 +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.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, 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 D33AB62D7F; Mon, 11 Sep 2017 19:01:57 +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 A8A2560B53; Mon, 11 Sep 2017 19:01:22 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id CDDC960D7B for ; Mon, 11 Sep 2017 19:00:32 +0000 (UTC) Received: from mxback15j.mail.yandex.net (mxback15j.mail.yandex.net [IPv6:2a02:6b8:0:1619::91]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 8CDAC43E58 for ; Mon, 11 Sep 2017 22:00:31 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback15j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uOdC7YBqVf-0VUKXt4U; Mon, 11 Sep 2017 22:00:31 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Xiwxkqm3eV-0VlGo28C; Mon, 11 Sep 2017 22:00:31 +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: Mon, 11 Sep 2017 22:00:06 +0300 Message-Id: <1505156408-13887-18-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> References: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 173 Subject: [lng-odp] [PATCH API-NEXT v1 17/19] test: try detecting CUnit location, if it is not found by pkg-config 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 CUnit 2.1-2 supplied incorrect cunit.pc file, resulting in pkg-config failing to detect library. Try checking CUnit header/library in case of pkg-config failure. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 173 (muvarov:api-next) ** https://github.com/Linaro/odp/pull/173 ** Patch: https://github.com/Linaro/odp/pull/173.patch ** Base sha: 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 ** Merge commit sha: 057be0905a62a157cc96a91743ea70e66e8554ca **/ test/common_plat/m4/validation.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index e303f8f2..78c4ec03 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -12,7 +12,13 @@ AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) ########################################################################## cunit_support=$test_vald AS_IF([test "x$cunit_support" = "xyes"], - [PKG_CHECK_MODULES([CUNIT], [cunit])]) + [PKG_CHECK_MODULES([CUNIT], [cunit], [], + [AC_MSG_WARN([pkg-config could not find CUnit, guessing]) + AC_CHECK_HEADERS([CUnit/Basic.h], [], + [AC_MSG_ERROR(["can't find CUnit headers"])]) + AC_CHECK_LIB([cunit],[CU_get_error], [CUNIT_LIBS="-lcunit"], + [AC_MSG_ERROR([CUnit libraries required])]) +])]) AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_LIBS])