From patchwork Tue Sep 5 18:59:58 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: 111713 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3237541qge; Tue, 5 Sep 2017 12:04:35 -0700 (PDT) X-Google-Smtp-Source: ADKCNb71itpVeABHxGeBYGNnJ0HMHpJph4Ps0+BSI1GC3HGM1d5EYlQxAdkrPyxye6kwzTUuZ5E4 X-Received: by 10.237.39.144 with SMTP id a16mr112165qtd.167.1504638274995; Tue, 05 Sep 2017 12:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638274; cv=none; d=google.com; s=arc-20160816; b=EOhQmLNphLxwGbnaEKk16e+e6UtCaF147a/r4WQdRydNslu8fvONhInqRJKdbDkEbK L/WamVjx2gsjEepBv6momRnrhVVkCSD33UPKp9to1iEcDdYZ0TWgbkL1r0aO6SOdWLQm R2RYW3Y2Mm68camk3egPe7undF9klnE3diodnLPku5TYCbZOaxu7ZWq0fx3YerX07idE JB/wlCKTKGl7S1YQ/QoYs2npHTWVGMos/YZGOsWCW2QlZwga8zsGzdy9PxI0nFNT577v QSsQYqileLEH9TE8DWKFVfynWqrNhDbytNAdDpjiA0CDqQcrtcPyq9oii2pN2JaI8N59 UcBQ== 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=jiWuD2NeyEAsL2vQ3unTsc1F4SzemNH7G4ceAhWD0g4=; b=rOUifCu6K7HrVCTFKBlANy4520ntYUqgZ9v7DnEH2Vb94P/yplFaDIUjUjbr4UMKfr h8Tgs/w+OVUe3VIh/Ruc7BRuT1yuJNTnf6eLXkAbAJf7R4TgAIHK/tejMli4+VgRwPGM GEcT/K1t5Xs0MeDr+1O1e4kONNHAebH0AH7GE7cApAk7/Q/Ks07GXsBbV9mX9yGKlu9R 6lcBkjxyG2fqz0ozDf+XwHeJOqH2Vr5XFwSFF1XevoGNwxX7bXZMvoH2j8JTMx1K7B7N QJlOQ0FZklOjE6/mTcuwHqpwTMfDkCFTQ6jiGOVVtmfriKzMaloPqulIRzVgioNRIMa3 swWg== 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 k68si1104076qkl.212.2017.09.05.12.04.34; Tue, 05 Sep 2017 12:04:34 -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 882E76156C; Tue, 5 Sep 2017 19:04:34 +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 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 0D1B761DE2; Tue, 5 Sep 2017 19:00:49 +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 D5F3D6156C; Tue, 5 Sep 2017 19:00:28 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 705D760DB2 for ; Tue, 5 Sep 2017 19:00:19 +0000 (UTC) Received: from mxback10j.mail.yandex.net (mxback10j.mail.yandex.net [IPv6:2a02:6b8:0:1619::113]) by forward101o.mail.yandex.net (Yandex) with ESMTP id B2692134556E for ; Tue, 5 Sep 2017 22:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id e9z4Eam2ui-0FB0QOH6; Tue, 05 Sep 2017 22:00:15 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0FEKeGOj; Tue, 05 Sep 2017 22:00:15 +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, 5 Sep 2017 21:59:58 +0300 Message-Id: <1504638007-2671-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 2/11] configure: use ODP_CHECK_FLAG to check for -mcx16 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ configure.ac | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index df0a0f61..f6f69942 100644 --- a/configure.ac +++ b/configure.ac @@ -339,16 +339,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" case "${host}" in i?86? | x86*) if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then - my_save_cflags="$CFLAGS" - - CFLAGS=-mcx16 - AC_MSG_CHECKING([whether CC supports -mcx16]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes])] - [ODP_CFLAGS="$ODP_CFLAGS $CFLAGS"], - [AC_MSG_RESULT([no])] - ) - CFLAGS="$my_save_cflags" + ODP_CHECK_CFLAG([-mcx16]) fi ;; esac From patchwork Tue Sep 5 18:59:59 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: 111712 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3236096qge; Tue, 5 Sep 2017 12:03:27 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7nla/1yJ2nxjD+EK6F4Nv+nvJ8ZPpa9UddfD7EC4eCW4lBEuDFJASENBdY5NIWOcPhXCQM X-Received: by 10.200.15.132 with SMTP id b4mr115621qtk.127.1504638207592; Tue, 05 Sep 2017 12:03:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638207; cv=none; d=google.com; s=arc-20160816; b=PnkhXpwSdqDTL32l8dmdhK/yYH9A/MD5fj0sUwHXs/eREOpHf8RfRgOtLbpryy183F DIMwMlpAFcXhGt3SJrLsVgluiAp25q5kD6LAcpEyovkc5oT/goBDHWrcIasEAc9PzVLT 6WbL1qdBSSJF811hcq4Emaa1Ne0l9cSzUWhhwadVAtWxYNEMh2sjRe6ZTWYBBUt391wb 5vLrB9iBtKgsurkivgUk3wFjmR/L5DgU3/U9Gx3jwgizWIbwGWBJcDhE584XAjnzO/lM QbyvbF+wL3mtLNIVVGjJLK7FRkduuZBV2cqbgtmGt3RV1yQkxr+YObicnNiQtSFPX1gn HK0g== 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=sRaYVCS2Y4Ak4gZBTvWT/26UtNu6mZbzb1pzN3aBzhg=; b=Ja7u5eGJ9kLENLn7eLe1kcYBnnj5jxXIfg2waUhWge1r/g58nl91UEbSgYpumThFUF Pj8nww9KMYMFnJNHfnYLyWlWh+JtU6emPwTlPKCR0OyNU3j4/qeGp1wRpyJYxBRee6/r v1pTqW4cfHkr0plTTM14ylcztbtHSY7QTuhMMMqSBEul/ZUmGhE+7UguhoCxK0twJNp4 q7kzSksPm+66ju5f1T2CinZpK+0MSgcqkDuk5HRTSuighOaYwxmmH08tEzfRE0x1jV0T 1jZP83dQpICsagb7C0dZv10F7PhQMxcg48EAZ6FsIVxY/UKKRX+qnulrnCON9GrEk6M2 r3Ww== 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 v20si974690qth.117.2017.09.05.12.03.26; Tue, 05 Sep 2017 12:03:27 -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 D635463574; Tue, 5 Sep 2017 19:03:26 +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 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 8F4EF60F42; Tue, 5 Sep 2017 19:00:43 +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 385E161BBA; Tue, 5 Sep 2017 19:00:28 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 6936060D9E for ; Tue, 5 Sep 2017 19:00:19 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 6E20D1341197 for ; Tue, 5 Sep 2017 22:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 2JIOE0tYK1-0GG04twV; Tue, 05 Sep 2017 22:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0FEm1KCg; Tue, 05 Sep 2017 22:00:15 +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, 5 Sep 2017 21:59:59 +0300 Message-Id: <1504638007-2671-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 3/11] linux-gen: crypto: stop using RAND_pseudo_bytes() 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 RAND_pseudo_bytes() was deprecated in OpenSSL 1.1.0. It is recommended to use RAND_bytes() instead. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ platform/linux-generic/odp_crypto.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 563e919e..c7da548a 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1048,9 +1048,6 @@ int32_t odp_random_data(uint8_t *buf, uint32_t len, odp_random_kind_t kind) switch (kind) { case ODP_RANDOM_BASIC: - RAND_pseudo_bytes(buf, len); - return len; - case ODP_RANDOM_CRYPTO: rc = RAND_bytes(buf, len); return (1 == rc) ? (int)len /*success*/: -1 /*failure*/; From patchwork Tue Sep 5 19:00:00 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: 111711 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3234727qge; Tue, 5 Sep 2017 12:02:27 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4RN4V4JfIJ/e0K1HdzFLS7K1VO5NgauViPDXzAkIyNIwpcJ/kHie6tbIXXkdOzrxODkA7C X-Received: by 10.200.40.154 with SMTP id i26mr102610qti.153.1504638146913; Tue, 05 Sep 2017 12:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638146; cv=none; d=google.com; s=arc-20160816; b=qU93Agn8LBY7hkHu1II1OkkiVKAetwWF/6TBklVKwU79SJvl0m2XWLvgsJ3rxMpQsE UzFzKpCH4+44RRJF6N11hayfGCoTaWmP0gwBUDRg1z7EM5CcQ9+SQb7KKUCWIuZJZ6NA S0og7vvCkoTxITi5EnauVshPTa96uGRSrIXsmOzIqLWhaRpWyy8skM8ghlEoVwu2wXNT 4cA+n63vTvQMYpscdrOq+pig4tSJ+ZYaxYg/dP00PW+a/BVYkbbBRc9qH6f+bQ1OaZsn h4kV4ioC3x0/5wHmNqv/jXwCfYSe+1QgxkEbx2xy94+36jmbwU96533+SlkOpIzjSQUj 78+w== 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=QlM4hFIUqS/bu+6qqRJvd5gawao9wCPi9YgqaJCWUF8=; b=kjqPCBlpReuWa3Q4mW9/zw/2d0beNvpaMSbQdjU2qYgOegMaFeN6or+VPPMufY1Kea cqmoB6zP7cLFff+G0b+5lz1BOWV3ibxmtCAhuKAl1YVvuj/uYVP8KSWHl9WkZjl1v407 csK7xAKzgOYn+hn6tf0/a27mnUIiNEEnBul4I4HYO6F7W4ZAs0HnKXxlnhhMfGTfn5dm 77OmNrGdo32ocPchJm73otPcjWO+5FnC/2SgriUZ3mjyPlvUmXypk7/LlP4d8/IP6QV+ 7iu39Wmt7N+cBjeSln49kYG7dVrGP/fa5TmJdqbiWvxvEujkPGDoU4RAOMhhZ8fQWbfq xdBw== 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 i25si800201qtg.455.2017.09.05.12.02.26; Tue, 05 Sep 2017 12:02:26 -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 7FF3B62DF3; Tue, 5 Sep 2017 19:02:26 +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 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 18FE461D00; Tue, 5 Sep 2017 19:00:36 +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 4C15B6156C; Tue, 5 Sep 2017 19:00:28 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 83F0560D8D for ; Tue, 5 Sep 2017 19:00:18 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 3F46A2D83F17 for ; Tue, 5 Sep 2017 22:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id QJoWAMoRQ0-0HGCdNxt; Tue, 05 Sep 2017 22:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0GEO3cB3; Tue, 05 Sep 2017 22:00:16 +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, 5 Sep 2017 22:00:00 +0300 Message-Id: <1504638007-2671-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 4/11] build: drop -Wno-deprecated-declaration 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 We do not use deprecated attribute anymore, thus let's drop the -Wno-deprecated-declaration flag from compiler options. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ platform/Makefile.inc | 3 --- test/common_plat/validation/api/Makefile.am | 3 --- 2 files changed, 6 deletions(-) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 738f0f9a..a88e8384 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -13,9 +13,6 @@ AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' AM_CFLAGS += "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) -#The implementation will need to retain the deprecated implementation -AM_CFLAGS += -Wno-deprecated-declarations - AM_CFLAGS += @PTHREAD_CFLAGS@ odpapispecincludedir= $(includedir)/odp/api/spec diff --git a/test/common_plat/validation/api/Makefile.am b/test/common_plat/validation/api/Makefile.am index e2d30a67..601bae6d 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -23,6 +23,3 @@ ODP_MODULES = atomic \ system SUBDIRS = $(ODP_MODULES) - -#The tests will need to retain the deprecated test implementation -AM_CFLAGS += -Wno-deprecated-declarations From patchwork Tue Sep 5 19:00:01 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: 111714 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3239157qge; Tue, 5 Sep 2017 12:05:49 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7zTXyIeOdII46kLI1xZIPTwSS5ieAOZOMSpMkJ8AZYZ00Ws2WJ8uVya4xYUP5sYaXGfMlG X-Received: by 10.55.19.136 with SMTP id 8mr154532qkt.144.1504638348931; Tue, 05 Sep 2017 12:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638348; cv=none; d=google.com; s=arc-20160816; b=bWjaoFIC+zCBryTmVIjXGcHnKCHAyEp5pgL2vKKHaG4MfmLI5jSqlfwjp0JZa5m7+X b2ozulCugNPdQvFyX3ubiT+e2QhXBNpurD1BIaDdurnaS7iiS9udovUXhwUQDYYr/jSc Myi1cFpwWfLLha7lEZtWFIQYEzCaDtgmSwR1v6OeatEmFchN2uIiiK9lWK1Zmd/HjsAX cJ8o0IG6jDQGd6g7rfKMP4yvopYG0+4+UbKzyarNjKswtTu9NprYo8Vv7dZn7vlsrSeC sQ/b8ju4fEWiKe5l3wa8bBeGfmtQ3kW9M73zVg95FraBYNNuVe9qv7cfYmKYRHFvprMK steQ== 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=6oHMX5BgFNHIUgdI8PkBDohUouhicV2rotS819v9akg=; b=yY4NX9QJvmhfiFGox+3YRcgxAUTrpCfcpnynjB/wgxL1YBxJkh3mYJ1I90BzRSWYfN 9QKNMN+18fiwjJdrO2Yd5Z9IRbEqUqY7ib93MgY8hDF9XqgZ57a03DQ0y05rv/L1hxIx aORIMQx5JXPC6CdDQQGFprpuSGAR0w7F645D+VsgUpUikuScpDxILQpFqK0mUTf5oqSs P0EXaZtJeTV47P535XsN5A8qznLKRC8owaEw9MidGo/OooEj1+l+rcZXmlQFwpZ7XtBQ ioG7jVcQPulz6Bs54T5qxbiafHd29pdmYEfc0f239mRHz3FFNijwy1Mc94SMTCx6jWLn UXnA== 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 z9si1076270qkf.101.2017.09.05.12.05.48; Tue, 05 Sep 2017 12:05:48 -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 8680062CE0; Tue, 5 Sep 2017 19:05:48 +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 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 5471461E19; Tue, 5 Sep 2017 19:00:59 +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 0089F60DB2; Tue, 5 Sep 2017 19:00:28 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 5343160D8F for ; Tue, 5 Sep 2017 19:00:19 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 0B6355D821DE for ; Tue, 5 Sep 2017 22:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4L31gMirG2-0HduMoiv; Tue, 05 Sep 2017 22:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0HE0P8OX; Tue, 05 Sep 2017 22:00:17 +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, 5 Sep 2017 22:00:01 +0300 Message-Id: <1504638007-2671-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 5/11] build: drop platorm/linux-generic/Makefile.inc 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 Mandate that platform provides platform/$(with_platform)/arch/$(ARCH_DIR) directory and reference it directly from all Makefile.am/.inc files. Main reason for this change is to allow automake to process all includes at the time of Makefile.am -> Makefile.in conversion. Currently it can not determine path for platform/@with_platform@/Makefile.inc, thus inclusion is left for main make invocation. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ example/Makefile.inc | 2 +- helper/Makefile.am | 3 +-- helper/test/Makefile.am | 3 +-- platform/linux-generic/Makefile.am | 5 ++--- platform/linux-generic/Makefile.inc | 2 -- test/Makefile.inc | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 platform/linux-generic/Makefile.inc diff --git a/example/Makefile.inc b/example/Makefile.inc index c6d7ff5f..7cc21154 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS += \ @@ -9,6 +8,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/helper/include \ -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index c69fd678..ca512ff1 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc @@ -9,6 +7,7 @@ AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ AM_CFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index beef9191..00997f10 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before @@ -13,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ -I$(top_srcdir)/helper diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8f0618f4..eada421c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -2,13 +2,13 @@ #export CUSTOM_STR=https://git.linaro.org/lng/odp.git include $(top_srcdir)/platform/Makefile.inc -include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude +AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) @@ -170,8 +170,7 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/ip.h \ ${srcdir}/include/protocols/ipsec.h \ ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/udp.h \ - ${srcdir}/Makefile.inc + ${srcdir}/include/protocols/udp.h __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ diff --git a/platform/linux-generic/Makefile.inc b/platform/linux-generic/Makefile.inc deleted file mode 100644 index 876519be..00000000 --- a/platform/linux-generic/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) -AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) diff --git a/test/Makefile.inc b/test/Makefile.inc index 728868df..d701ebd7 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before @@ -12,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/test \ -I$(top_builddir)/include From patchwork Tue Sep 5 19:00:02 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: 111717 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3244184qge; Tue, 5 Sep 2017 12:10:08 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6C2ksPsFJofpVSFwQssJJyfv9HHYBvQ8sIjz9mzrwzm4WWyVaAysMvMRUidXsgmC+6J4l0 X-Received: by 10.55.104.150 with SMTP id d144mr110731qkc.185.1504638608016; Tue, 05 Sep 2017 12:10:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638608; cv=none; d=google.com; s=arc-20160816; b=WQHGlObLA+bEu+ppUPDhqw6KjeYqteb2QI/iTh7BWOOqs1j6fezWQoU6aLU0xfD7Xw hRU8+xqhnZusk5bo/ztrErj/RQ7UeHiHKtMaZkS0Kwr8RpcZb0IUIdi6aORkpf/Dtil6 93pQR3QPY3VMNGZK0z/moPX+JnFptMOOIy8fzF8EYyQRIC7Ff20XUh0fPfnq5i3h6ZAI X9v83t4VPe46xcREqODhJHr7kVztqxocu481Hb8AmOJbZJ5Tc4IyaXyzU8cBAJI3eTS7 wnSU+m81VzC7LJLkeO8/tNfUeIsC+mTctoG6E43SQ6H0wrUzQFeuDTuznoO78hV+x5T/ fwUQ== 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=xwvuifxaPEc3R6uqOkWN2JFzhJAQPvDjQ30pDlzHSUY=; b=0sPtl5rxcnIhHJE6W3WsHRhFxNJLxqO8rv9Yt5lYWFTFS0Dg1Ju69+C/AplMHju8BD /A2ot/lgRxowQn82kr7pevchiekbhHEYOQdLKYrVj86v5kZfh9LKP08bdEpmzUM/wBKQ i5I9pBZyjShemJqlqAjJgwRNFYrqXid89qPdmiV+G1EwrTQwML5XmKgQSPFeyu0/uoe6 zqXIjf/h3qXRTu2HmBgISGmbJXkNm7Pp3FGhsquJ7DTM1lWYF+drD3ZYjIOAcqRvHUPP C3DVVzcPi8bpxdurIqjAx388RAoGXu2ZNPx6aW/QRwUcKDH5Ip3kR5+EeWG0lHjazEm7 /10Q== 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 u19si967412qtc.122.2017.09.05.12.10.07; Tue, 05 Sep 2017 12:10:07 -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 9005462C62; Tue, 5 Sep 2017 19:10:07 +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 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 6438062CE2; Tue, 5 Sep 2017 19:01:26 +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 F0DA561D9A; Tue, 5 Sep 2017 19:00:36 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 10F6C60DC9 for ; Tue, 5 Sep 2017 19:00:20 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward105o.mail.yandex.net (Yandex) with ESMTP id B95F0444529F for ; Tue, 5 Sep 2017 22:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YNycJMPEpi-0IaanXBH; Tue, 05 Sep 2017 22:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0IEuELMR; Tue, 05 Sep 2017 22:00:18 +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, 5 Sep 2017 22:00:02 +0300 Message-Id: <1504638007-2671-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 6/11] build: use AM_CPPFLAGS to set include paths, rather than AM_CFLAGS 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ helper/Makefile.am | 14 +++++++------- helper/test/Makefile.am | 2 +- platform/linux-generic/Makefile.am | 12 ++++++------ test/Makefile.inc | 3 +-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/helper/Makefile.am b/helper/Makefile.am index ca512ff1..fa503f1a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,13 +2,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ -AM_CFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ +AM_CPPFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 00997f10..fdc15f96 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,7 +17,7 @@ INCFLAGS = \ ODP_PLATFORM=${with_platform} -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS += $(INCFLAGS) AM_LDFLAGS += -static EXECUTABLES = chksum$(EXEEXT) \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eada421c..e644505e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,12 +3,12 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/include -AM_CFLAGS += -Iinclude -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -Iinclude +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/test/Makefile.inc b/test/Makefile.inc index d701ebd7..f5bb7674 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -15,9 +15,8 @@ INCFLAGS = \ -I$(top_srcdir)/test \ -I$(top_builddir)/include -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS += $(CUNIT_CFLAGS) -AM_CXXFLAGS = $(INCFLAGS) AM_LDFLAGS += -L$(LIB) From patchwork Tue Sep 5 19:00:03 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: 111716 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3242531qge; Tue, 5 Sep 2017 12:08:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAIMmglGv4Mg1DljAMP6NaNyv7O6dZSJkSPtCiLt6Du9Pk34ZNj2fDQdLNGdrq7A1p5TtQO X-Received: by 10.233.235.66 with SMTP id b63mr130546qkg.41.1504638519997; Tue, 05 Sep 2017 12:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638519; cv=none; d=google.com; s=arc-20160816; b=wrarAn4XfLuqzr/KX0b6YTGPCkLSIxK/XRwLHAQw/y6CV9/X48FTLh0/o50LR1Rx5v /+p7B7a5i1JJpwzoIMYHBZYDGinISZGxTcRjKUukhK+T3oYw5lYFsMgu+odZvDkzN9Tk 0/AfzA5i/GTdXLHsuDvuSlX6jMBff8LfFxoJivQSW2KmQQavz07hshiJZ7SqPIZdc+j7 jntcxTSxBzDIBWUdGdoTLnnDRT+NqzDHpxZH4hWydkDvhj1AFG/QjcF2d5p4/AcnTeCs 07lG2PTzipOFQzHIg+0qfnXe6eRcV256tjC3GyMJHzet4zVW0IIyR+P22ndpmy0hFVHH GwyA== 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=XhiN4esyesCxbuH6CUPNePFqKwRnfMRYC/0oBw91z/c=; b=OoAn2ZXjxByoPGwZrQy0vXatP/3UuyaS2qkQOvE2ykPbS322P97+cWlWAfc1pgfRGo 9iKNj7KugKAXBs9NDdsnCDtAyme30XYKUa4704vRJz9KsCXAENm/Ta0SxcGTK7I6TwFH 6atO1wkhe0FmD1XBNjDEYjyAf++2LpqIFvL1VYFFPZ5FyZY+wmA6Q8pjfNMKSWeTcrnd 0UwN3lDddh3ZtftZ0GApMHYSr14e3xrPdFRkGEq7vqxXM7PrIXR0+TnKoEqCCM+D8cSG PTpZStkL9xYfG+iWSnYD2HXfgaOsSh8j8Q04Nl4h5pvACGs6xkR1Z9VTTJrVYTpsbb3D V/nA== 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 d8si934469qtd.442.2017.09.05.12.08.39; Tue, 05 Sep 2017 12:08:39 -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 871CF62875; Tue, 5 Sep 2017 19:08:39 +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 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 1147362C62; Tue, 5 Sep 2017 19:01:20 +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 9328B61DE2; Tue, 5 Sep 2017 19:00:36 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 56B7C60EA6 for ; Tue, 5 Sep 2017 19:00:21 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward104o.mail.yandex.net (Yandex) with ESMTP id E4E112C83F88 for ; Tue, 5 Sep 2017 22:00:19 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Vu3oAYNQcg-0JwKjPu0; Tue, 05 Sep 2017 22:00:19 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0JEK404e; Tue, 05 Sep 2017 22:00:19 +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, 5 Sep 2017 22:00:03 +0300 Message-Id: <1504638007-2671-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 7/11] configure: stop setting AM_* variables 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 AM_* variables by design should be set by Makefile.am, not by configure.ac. Use CFLAGS/CXXFLAGS instead. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ configure.ac | 12 +++--------- example/Makefile.inc | 4 ++-- helper/Makefile.am | 4 ++-- helper/test/Makefile.am | 4 ++-- platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 2 +- test/Makefile.inc | 4 ++-- test/linux-generic/Makefile.inc | 4 ++-- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index f6f69942..d4c07a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -329,6 +329,7 @@ ODP_CHECK_CFLAG([-Wformat-truncation=0]) ODP_CHECK_CFLAG([-Wformat-overflow=0]) ODP_CFLAGS="$ODP_CFLAGS -std=c99" +ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11" # Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" @@ -347,8 +348,8 @@ esac ########################################################################## # Default include setup ########################################################################## -AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS" -AM_CXXFLAGS="-std=c++11" +CFLAGS="$CFLAGS $ODP_CFLAGS" +CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" AC_CONFIG_FILES([Makefile pkgconfig/libodp-linux.pc @@ -359,11 +360,8 @@ AC_CONFIG_FILES([Makefile # distribute the changed variables among the Makefiles AC_SUBST([LIBS]) -AC_SUBST([AM_CPPFLAGS]) AC_SUBST([CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) AC_SUBST([CFLAGS]) -AC_SUBST([AM_LDFLAGS]) AC_SUBST([LDFLAGS]) AC_SUBST([EXEEXT]) @@ -390,12 +388,8 @@ AC_MSG_RESULT([ cc: ${CC} cc version: ${CC_VERSION} cppflags: ${CPPFLAGS} - am_cppflags: ${AM_CPPFLAGS} - am_cxxflags: ${AM_CXXFLAGS} cflags: ${CFLAGS} - am_cflags: ${AM_CFLAGS} ldflags: ${LDFLAGS} - am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} defs: ${DEFS} static libraries: ${enable_static} diff --git a/example/Makefile.inc b/example/Makefile.inc index 7cc21154..cba385b7 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) -AM_CFLAGS += \ +AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ -I$(top_srcdir)/platform/@with_platform@/include \ @@ -11,4 +11,4 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include -AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index fa503f1a..bf75b467 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,7 +2,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib -AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ @@ -10,7 +10,7 @@ AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ AM_CPPFLAGS += -I$(top_builddir)/include -AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' +AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fdc15f96..e30a1e71 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,8 +17,8 @@ INCFLAGS = \ ODP_PLATFORM=${with_platform} -AM_CPPFLAGS += $(INCFLAGS) -AM_LDFLAGS += -static +AM_CPPFLAGS = $(INCFLAGS) +AM_LDFLAGS = -static EXECUTABLES = chksum$(EXEEXT) \ cuckootable$(EXEEXT) \ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index a88e8384..f6722560 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -8,9 +8,9 @@ pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc VPATH = $(srcdir) $(builddir) lib_LTLIBRARIES = $(LIB)/libodp-linux.la -AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' +AM_LDFLAGS = -version-number '$(ODP_LIBSO_VERSION)' -AM_CFLAGS += "-DGIT_HASH=$(VERSION)" +AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) AM_CFLAGS += @PTHREAD_CFLAGS@ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e644505e..f5f65384 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CPPFLAGS += -I$(top_builddir)/include diff --git a/test/Makefile.inc b/test/Makefile.inc index f5bb7674..8bd21432 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,9 +16,9 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) -AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS) -AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB) @VALGRIND_CHECK_RULES@ valgrind_tools = memcheck diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index ff99fbc9..cfb61441 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -2,9 +2,9 @@ # build specific ODP applications, (i.e those whose do more than validation # test wrapping) -AM_LDFLAGS += -static +AM_LDFLAGS = -static -AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib From patchwork Tue Sep 5 19:00:04 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: 111720 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3250026qge; Tue, 5 Sep 2017 12:14:47 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6t+RZ4MG3Eb0/m6Hff5uFJCBPZEixwA6wuf4MIPhTByIBACZW44IN12U/1dmYcBbgfZTeL X-Received: by 10.200.4.158 with SMTP id s30mr148411qtg.311.1504638887729; Tue, 05 Sep 2017 12:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638887; cv=none; d=google.com; s=arc-20160816; b=izYvwQvMub+V9SMr0NorfDBSUxBe+1wuFTP56fd0qnu1+6sSA5AVeZu3K4mj4SV/tg fOmdkxCCiOB+HSSgE9US15FwNeRHO3O2CIjEuHIeozCmZrcF1daKiU79cyKG9jPS/ggo Aq8dPHB4ZqKiFRgzCirVMxbjHwWSyGJn66g9mxTNZu7dtswaYY/AREiAsoT7Oitlca9a d+z+oqr1UkCnR4vOO0+cnUy0Udv/X7OLPbweaowZRwtuPnmf5hEJsUb9LJZ62zh14dNl RQtzIiGPBaXilFXCLdNuVb9tcVFaRhM+RShScVrjZII+D9CQxVge10v8oYHG1ltfwqYC 1VWA== 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=ippy4GsQj8MEGCZNiutxeuxxSQ0G7rQNIZtu0dW4bDs=; b=tS4dT28uEXYe0mSvjQ177V4hSCsOFWfNOMM5TFx0lTr0ubg218/38/v/QR6M66K18j UsXnbCcMftcSevsR176DYrm+fLsdx/g430pBVOa6xKicvURD6b9R1+kEc45iQuiifyyt hUDtx1NAjc5Mjuh73YF3b7DZKF3+UKXhu7zUv4ZWQzK5B/BqzgDXLFbbrlep3XJzIjdr +ST6oQ9iOCfBFbCoDuL3hj49mKBBxqqRxaXsWvwOLOyE5FmQAVmNVpKVRIOrz3rFLIod 9c/ODQBbs0+2lSRsQdXbMxqoTllyR976Nk1eNMqd526rCR7ecIkr2CxWhaqz+TDb9OE0 9Zqg== 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 x54si950442qtc.247.2017.09.05.12.14.47; Tue, 05 Sep 2017 12:14:47 -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 6175960883; Tue, 5 Sep 2017 19:14:47 +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 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 5590562D0D; Tue, 5 Sep 2017 19:01:56 +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 9F67661DE2; Tue, 5 Sep 2017 19:00:43 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 4D0DC60890 for ; Tue, 5 Sep 2017 19:00:22 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 50A8A5605633 for ; Tue, 5 Sep 2017 22:00:21 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ua9CTAs5dI-0LeC5R60; Tue, 05 Sep 2017 22:00:21 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0KEKahlv; Tue, 05 Sep 2017 22:00:20 +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, 5 Sep 2017 22:00:04 +0300 Message-Id: <1504638007-2671-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 8/11] test: rework build system 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 - Stop using extra libraries just to create a test executable - Stop using EXTRA_DIST to distribute headers, include them into _SOURCES - Stop using unnecessary dist_ prefixes, sources are distributed automatically Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ test/common_plat/common/Makefile.am | 8 +++----- test/common_plat/miscellaneous/Makefile.am | 2 +- test/common_plat/performance/Makefile.am | 19 +++++++++---------- test/common_plat/validation/api/atomic/Makefile.am | 9 ++------- test/common_plat/validation/api/barrier/Makefile.am | 9 ++------- test/common_plat/validation/api/buffer/Makefile.am | 9 ++------- .../validation/api/classification/Makefile.am | 20 +++++++++----------- test/common_plat/validation/api/cpumask/Makefile.am | 10 ++-------- test/common_plat/validation/api/crypto/Makefile.am | 16 ++++++++-------- test/common_plat/validation/api/errno/Makefile.am | 9 ++------- test/common_plat/validation/api/hash/Makefile.am | 9 ++------- test/common_plat/validation/api/init/Makefile.am | 16 ++++++---------- test/common_plat/validation/api/lock/Makefile.am | 9 ++------- test/common_plat/validation/api/packet/Makefile.am | 9 ++------- test/common_plat/validation/api/pktio/Makefile.am | 9 ++------- test/common_plat/validation/api/pool/Makefile.am | 9 ++------- test/common_plat/validation/api/queue/Makefile.am | 9 ++------- test/common_plat/validation/api/random/Makefile.am | 9 ++------- .../validation/api/scheduler/Makefile.am | 9 ++------- test/common_plat/validation/api/shmem/Makefile.am | 9 ++------- .../common_plat/validation/api/std_clib/Makefile.am | 9 ++------- test/common_plat/validation/api/system/Makefile.am | 9 ++------- test/common_plat/validation/api/thread/Makefile.am | 12 +++--------- test/common_plat/validation/api/time/Makefile.am | 8 ++------ test/common_plat/validation/api/timer/Makefile.am | 9 ++------- .../validation/api/traffic_mngr/Makefile.am | 8 ++------ test/linux-generic/mmap_vlan_ins/Makefile.am | 2 +- test/linux-generic/pktio_ipc/Makefile.am | 8 ++------ test/linux-generic/ring/Makefile.am | 20 ++++++++------------ test/linux-generic/validation/api/shmem/Makefile.am | 13 ++++--------- test/linux-generic/validation/api/shmem/shmem.h | 21 --------------------- 31 files changed, 92 insertions(+), 235 deletions(-) delete mode 100644 test/linux-generic/validation/api/shmem/shmem.h diff --git a/test/common_plat/common/Makefile.am b/test/common_plat/common/Makefile.am index 9fd08ee8..5736214a 100644 --- a/test/common_plat/common/Makefile.am +++ b/test/common_plat/common/Makefile.am @@ -2,12 +2,10 @@ include $(top_srcdir)/test/Makefile.inc noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la -libcunit_common_la_SOURCES = odp_cunit_common.c +libcunit_common_la_SOURCES = odp_cunit_common.c odp_cunit_common.h libcunit_common_la_LIBADD = $(CUNIT_LIBS) -libcpumask_common_la_SOURCES = mask_common.c +libcpumask_common_la_SOURCES = mask_common.c mask_common.h -libthrmask_common_la_SOURCES = mask_common.c +libthrmask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK - -EXTRA_DIST = mask_common.h odp_cunit_common.h diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 7d8cf353..48240efe 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -9,4 +9,4 @@ odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS) odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static -dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp +odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 3299f03f..c67de749 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -40,16 +40,15 @@ odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ - $(top_srcdir)/test/test_debug.h \ - dummy_crc.h + $(top_srcdir)/test/test_debug.h -dist_odp_bench_packet_SOURCES = odp_bench_packet.c -dist_odp_crypto_SOURCES = odp_crypto.c -dist_odp_pktio_ordered_SOURCES = odp_pktio_ordered.c -dist_odp_sched_latency_SOURCES = odp_sched_latency.c -dist_odp_scheduling_SOURCES = odp_scheduling.c -dist_odp_pktio_perf_SOURCES = odp_pktio_perf.c +odp_bench_packet_SOURCES = odp_bench_packet.c +odp_crypto_SOURCES = odp_crypto.c +odp_pktio_ordered_SOURCES = odp_pktio_ordered.c dummy_crc.h +odp_sched_latency_SOURCES = odp_sched_latency.c +odp_scheduling_SOURCES = odp_scheduling.c +odp_pktio_perf_SOURCES = odp_pktio_perf.c -EXTRA_DIST = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS) -dist_check_SCRIPTS = udp64.pcap +dist_check_DATA = udp64.pcap diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am index 9b6bd631..b09d3b88 100644 --- a/test/common_plat/validation/api/atomic/Makefile.am +++ b/test/common_plat/validation/api/atomic/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestatomic.la -libtestatomic_la_SOURCES = atomic.c - test_PROGRAMS = atomic_main$(EXEEXT) -dist_atomic_main_SOURCES = atomic_main.c -atomic_main_LDADD = libtestatomic.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = atomic.h +atomic_main_SOURCES = atomic_main.c atomic.c atomic.h +atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am index 8fc632c2..4dfb1d1e 100644 --- a/test/common_plat/validation/api/barrier/Makefile.am +++ b/test/common_plat/validation/api/barrier/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestbarrier.la -libtestbarrier_la_SOURCES = barrier.c - test_PROGRAMS = barrier_main$(EXEEXT) -dist_barrier_main_SOURCES = barrier_main.c -barrier_main_LDADD = libtestbarrier.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = barrier.h +barrier_main_SOURCES = barrier_main.c barrier.c barrier.h +barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am index add2a341..ae6ce0a4 100644 --- a/test/common_plat/validation/api/buffer/Makefile.am +++ b/test/common_plat/validation/api/buffer/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestbuffer.la -libtestbuffer_la_SOURCES = buffer.c - test_PROGRAMS = buffer_main$(EXEEXT) -dist_buffer_main_SOURCES = buffer_main.c -buffer_main_LDADD = libtestbuffer.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = buffer.h +buffer_main_SOURCES = buffer_main.c buffer.c buffer.h +buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am index df382c51..f177528e 100644 --- a/test/common_plat/validation/api/classification/Makefile.am +++ b/test/common_plat/validation/api/classification/Makefile.am @@ -1,14 +1,12 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestclassification.la -libtestclassification_la_SOURCES = odp_classification_basic.c \ - odp_classification_tests.c \ - odp_classification_test_pmr.c \ - odp_classification_common.c \ - classification.c - test_PROGRAMS = classification_main$(EXEEXT) -dist_classification_main_SOURCES = classification_main.c -classification_main_LDADD = libtestclassification.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = classification.h odp_classification_testsuites.h +classification_main_SOURCES = classification_main.c \ + odp_classification_basic.c \ + odp_classification_tests.c \ + odp_classification_testsuites.h \ + odp_classification_test_pmr.c \ + odp_classification_common.c \ + classification.c \ + classification.h +classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am index ec5fce33..ddafb9ab 100644 --- a/test/common_plat/validation/api/cpumask/Makefile.am +++ b/test/common_plat/validation/api/cpumask/Makefile.am @@ -1,11 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestcpumask.la -libtestcpumask_la_SOURCES = cpumask.c -libtestcpumask_la_LIBADD = $(LIBCPUMASK_COMMON) - test_PROGRAMS = cpumask_main$(EXEEXT) -dist_cpumask_main_SOURCES = cpumask_main.c -cpumask_main_LDADD = libtestcpumask.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = cpumask.h +cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h +cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am index 3ea41b41..6660e1b2 100644 --- a/test/common_plat/validation/api/crypto/Makefile.am +++ b/test/common_plat/validation/api/crypto/Makefile.am @@ -1,11 +1,11 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestcrypto.la -libtestcrypto_la_SOURCES = crypto.c \ - odp_crypto_test_inp.c - test_PROGRAMS = crypto_main$(EXEEXT) -dist_crypto_main_SOURCES = crypto_main.c -crypto_main_LDADD = libtestcrypto.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = crypto.h odp_crypto_test_inp.h test_vectors.h test_vectors_len.h +crypto_main_SOURCES = crypto_main.c \ + crypto.c \ + crypto.h \ + odp_crypto_test_inp.c \ + odp_crypto_test_inp.h \ + test_vectors.h \ + test_vectors_len.h +crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am index a24275d6..8f7b2e88 100644 --- a/test/common_plat/validation/api/errno/Makefile.am +++ b/test/common_plat/validation/api/errno/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtesterrno.la -libtesterrno_la_SOURCES = errno.c - test_PROGRAMS = errno_main$(EXEEXT) -dist_errno_main_SOURCES = errno_main.c -errno_main_LDADD = libtesterrno.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = errno.h +errno_main_SOURCES = errno_main.c errno.c errno.h +errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am index b899b8bd..b37f2e00 100644 --- a/test/common_plat/validation/api/hash/Makefile.am +++ b/test/common_plat/validation/api/hash/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtesthash.la -libtesthash_la_SOURCES = hash.c - test_PROGRAMS = hash_main$(EXEEXT) -dist_hash_main_SOURCES = hash_main.c -hash_main_LDADD = libtesthash.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = hash.h +hash_main_SOURCES = hash_main.c hash.c hash.h +hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am index 0793e642..ba25c61f 100644 --- a/test/common_plat/validation/api/init/Makefile.am +++ b/test/common_plat/validation/api/init/Makefile.am @@ -1,16 +1,12 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestinit.la -libtestinit_la_SOURCES = init.c # most platforms are expected not to support multiple ODP inits # following each other: therefore 3 separate binaries are # created, each containing its ODP init test. test_PROGRAMS = init_main_abort$(EXEEXT) init_main_log$(EXEEXT) init_main_ok$(EXEEXT) -dist_init_main_abort_SOURCES = init_main_abort.c -dist_init_main_log_SOURCES = init_main_log.c -dist_init_main_ok_SOURCES = init_main_ok.c -init_main_abort_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = libtestinit.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = init.h +init_main_abort_SOURCES = init_main_abort.c init.c init.h +init_main_log_SOURCES = init_main_log.c init.c init.h +init_main_ok_SOURCES = init_main_ok.c init.c init.h +init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am index 29993df4..80740282 100644 --- a/test/common_plat/validation/api/lock/Makefile.am +++ b/test/common_plat/validation/api/lock/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestlock.la -libtestlock_la_SOURCES = lock.c - test_PROGRAMS = lock_main$(EXEEXT) -dist_lock_main_SOURCES = lock_main.c -lock_main_LDADD = libtestlock.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = lock.h +lock_main_SOURCES = lock_main.c lock.c lock.h +lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am index d8ebc1a2..fb356997 100644 --- a/test/common_plat/validation/api/packet/Makefile.am +++ b/test/common_plat/validation/api/packet/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestpacket.la -libtestpacket_la_SOURCES = packet.c - test_PROGRAMS = packet_main$(EXEEXT) -dist_packet_main_SOURCES = packet_main.c -packet_main_LDADD = libtestpacket.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = packet.h +packet_main_SOURCES = packet_main.c packet.c packet.h +packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am index c6368fba..eb4b6038 100644 --- a/test/common_plat/validation/api/pktio/Makefile.am +++ b/test/common_plat/validation/api/pktio/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestpktio.la -libtestpktio_la_SOURCES = pktio.c - test_PROGRAMS = pktio_main$(EXEEXT) -dist_pktio_main_SOURCES = pktio_main.c parser.c -pktio_main_LDADD = libtestpktio.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = pktio.h parser.h +pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h +pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am index 1eb8d714..85a37b05 100644 --- a/test/common_plat/validation/api/pool/Makefile.am +++ b/test/common_plat/validation/api/pool/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestpool.la -libtestpool_la_SOURCES = pool.c - test_PROGRAMS = pool_main$(EXEEXT) -dist_pool_main_SOURCES = pool_main.c -pool_main_LDADD = libtestpool.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = pool.h +pool_main_SOURCES = pool_main.c pool.c pool.h +pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am index a477e3c5..a5b6a9b1 100644 --- a/test/common_plat/validation/api/queue/Makefile.am +++ b/test/common_plat/validation/api/queue/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestqueue.la -libtestqueue_la_SOURCES = queue.c - test_PROGRAMS = queue_main$(EXEEXT) -dist_queue_main_SOURCES = queue_main.c -queue_main_LDADD = libtestqueue.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = queue.h +queue_main_SOURCES = queue_main.c queue.c queue.h +queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am index 69259a4d..e026f045 100644 --- a/test/common_plat/validation/api/random/Makefile.am +++ b/test/common_plat/validation/api/random/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestrandom.la -libtestrandom_la_SOURCES = random.c - test_PROGRAMS = random_main$(EXEEXT) -dist_random_main_SOURCES = random_main.c -random_main_LDADD = libtestrandom.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = random.h +random_main_SOURCES = random_main.c random.c random.h +random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am index 2555cab8..6c71b010 100644 --- a/test/common_plat/validation/api/scheduler/Makefile.am +++ b/test/common_plat/validation/api/scheduler/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestscheduler.la -libtestscheduler_la_SOURCES = scheduler.c - test_PROGRAMS = scheduler_main$(EXEEXT) -dist_scheduler_main_SOURCES = scheduler_main.c -scheduler_main_LDADD = libtestscheduler.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = scheduler.h +scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h +scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am index da88af66..d955cc22 100644 --- a/test/common_plat/validation/api/shmem/Makefile.am +++ b/test/common_plat/validation/api/shmem/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestshmem.la -libtestshmem_la_SOURCES = shmem.c - test_PROGRAMS = shmem_main$(EXEEXT) -dist_shmem_main_SOURCES = shmem_main.c -shmem_main_LDADD = libtestshmem.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = shmem.h +shmem_main_SOURCES = shmem_main.c shmem.c shmem.h +shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am index e2fc0ccf..919c2556 100644 --- a/test/common_plat/validation/api/std_clib/Makefile.am +++ b/test/common_plat/validation/api/std_clib/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libteststd_clib.la -libteststd_clib_la_SOURCES = std_clib.c - test_PROGRAMS = std_clib_main$(EXEEXT) -dist_std_clib_main_SOURCES = std_clib_main.c -std_clib_main_LDADD = libteststd_clib.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = std_clib.h +std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h +std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am index 3789c36c..15e6d49a 100644 --- a/test/common_plat/validation/api/system/Makefile.am +++ b/test/common_plat/validation/api/system/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestsystem.la -libtestsystem_la_SOURCES = system.c - test_PROGRAMS = system_main$(EXEEXT) -dist_system_main_SOURCES = system_main.c -system_main_LDADD = libtestsystem.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = system.h +system_main_SOURCES = system_main.c system.c system.h +system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am index eaf680cf..59e136b2 100644 --- a/test/common_plat/validation/api/thread/Makefile.am +++ b/test/common_plat/validation/api/thread/Makefile.am @@ -1,12 +1,6 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestthread.la -libtestthread_la_SOURCES = thread.c -libtestthread_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK -libtestthread_la_LIBADD = $(LIBTHRMASK_COMMON) - test_PROGRAMS = thread_main$(EXEEXT) -dist_thread_main_SOURCES = thread_main.c -thread_main_LDADD = libtestthread.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = thread.h +thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK +thread_main_SOURCES = thread_main.c thread.c thread.h +thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am index ca9c0562..faed577f 100644 --- a/test/common_plat/validation/api/time/Makefile.am +++ b/test/common_plat/validation/api/time/Makefile.am @@ -7,13 +7,9 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -noinst_LTLIBRARIES = libtesttime.la -libtesttime_la_SOURCES = time.c - test_PROGRAMS = time_main$(EXEEXT) -dist_time_main_SOURCES = time_main.c -time_main_LDADD = libtesttime.la $(LIBCUNIT_COMMON) $(LIBODP) +time_main_SOURCES = time_main.c time.c time_test.h +time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -EXTRA_DIST = time_test.h $(TESTSCRIPTS) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am index fe6872f4..4f79020d 100644 --- a/test/common_plat/validation/api/timer/Makefile.am +++ b/test/common_plat/validation/api/timer/Makefile.am @@ -1,10 +1,5 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtesttimer.la -libtesttimer_la_SOURCES = timer.c - test_PROGRAMS = timer_main$(EXEEXT) -dist_timer_main_SOURCES = timer_main.c -timer_main_LDADD = libtesttimer.la $(LIBCUNIT_COMMON) $(LIBODP) - -EXTRA_DIST = timer.h +timer_main_SOURCES = timer_main.c timer.c timer.h +timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am index 44d50a91..3884a13c 100644 --- a/test/common_plat/validation/api/traffic_mngr/Makefile.am +++ b/test/common_plat/validation/api/traffic_mngr/Makefile.am @@ -7,13 +7,9 @@ TEST_EXTENSIONS = .sh TESTS = $(TESTSCRIPTS) -noinst_LTLIBRARIES = libtesttraffic_mngr.la -libtesttraffic_mngr_la_SOURCES = traffic_mngr.c - test_PROGRAMS = traffic_mngr_main$(EXEEXT) -dist_traffic_mngr_main_SOURCES = traffic_mngr_main.c -traffic_mngr_main_LDADD = libtesttraffic_mngr.la -lm $(LIBCUNIT_COMMON) $(LIBODP) +traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h +traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) -EXTRA_DIST = traffic_mngr.h $(TESTSCRIPTS) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 5cac159c..5fb6afd9 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -12,4 +12,4 @@ plat_mmap_vlan_ins_LDFLAGS = $(AM_LDFLAGS) -static plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example # Clonned from example odp_l2fwd simple -dist_plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c +plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index 8858bd2f..ad5de50b 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -9,12 +9,8 @@ pktio_ipc1_LDFLAGS = $(AM_LDFLAGS) -static pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example pktio_ipc2_LDFLAGS = $(AM_LDFLAGS) -static -noinst_HEADERS = $(top_srcdir)/test/test_debug.h - -dist_pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c -dist_pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c - -EXTRA_DIST = ipc_common.h +pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h +pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h dist_check_SCRIPTS = pktio_ipc_run.sh test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am index 14f60b85..57ba82ae 100644 --- a/test/linux-generic/ring/Makefile.am +++ b/test/linux-generic/ring/Makefile.am @@ -1,15 +1,11 @@ include ../Makefile.inc -noinst_LTLIBRARIES = libtestring.la -libtestring_la_SOURCES = ring_suites.c ring_basic.c ring_stress.c -libtestring_la_CFLAGS = $(AM_CFLAGS) $(INCCUNIT_COMMON) $(INCODP) - test_PROGRAMS = ring_main$(EXEEXT) -dist_ring_main_SOURCES = ring_main.c - -ring_main_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include -ring_main_LDFLAGS = $(AM_LDFLAGS) -ring_main_LDADD = libtestring.la $(LIBCUNIT_COMMON) $(LIBODP) - -noinst_HEADERS = ring_suites.h - +ring_main_SOURCES = \ + ring_main.c \ + ring_suites.c ring_suites.h \ + ring_basic.c ring_stress.c + +ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ + $(INCCUNIT_COMMON) $(INCODP) +ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index e330d633..6ff77b00 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -1,29 +1,24 @@ include ../Makefile.inc #the main test program is shmem_linux, which, in turn, starts a shmem_odp: -test_PROGRAMS = shmem_linux$(EXEEXT) -test_extra_PROGRAMS = shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT) -test_extradir = $(testdir) +test_PROGRAMS = shmem_linux$(EXEEXT) shmem_odp1$(EXEEXT) shmem_odp2$(EXEEXT) #shmem_linux is stand alone, pure linux (no ODP): -dist_shmem_linux_SOURCES = shmem_linux.c +shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: -dist_shmem_odp1_SOURCES = shmem_odp1.c +shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h shmem_odp1_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) shmem_odp1_LDFLAGS = $(AM_LDFLAGS) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -dist_shmem_odp2_SOURCES = shmem_odp2.c +shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h shmem_odp2_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) shmem_odp2_LDFLAGS = $(AM_LDFLAGS) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) - - -noinst_HEADERS = shmem_common.h shmem_linux.h shmem_odp1.h shmem_odp2.h diff --git a/test/linux-generic/validation/api/shmem/shmem.h b/test/linux-generic/validation/api/shmem/shmem.h deleted file mode 100644 index 2368a2e1..00000000 --- a/test/linux-generic/validation/api/shmem/shmem.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef _ODP_LINUX_TEST_SHMEM_H_ -#define _ODP_LINUX_TEST_SHMEM_H_ - -#include - -/* test functions: */ -void shmem_test_odp_shm_proc(void); - -/* test arrays: */ -extern odp_testinfo_t shmem_linux_suite[]; - -/* test registry: */ -extern odp_suiteinfo_t shmem_linux_suites[]; - -#endif From patchwork Tue Sep 5 19: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: 111715 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3240690qge; Tue, 5 Sep 2017 12:07:01 -0700 (PDT) X-Google-Smtp-Source: ADKCNb53mSWgwArFDm46adel+CrBA2o+72iB1NqFjbrMNTnH0yMy9yu15zAxKst8PiJDLAA9B+Lt X-Received: by 10.200.42.4 with SMTP id k4mr166336qtk.268.1504638421742; Tue, 05 Sep 2017 12:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638421; cv=none; d=google.com; s=arc-20160816; b=WMDClUOmRU/6QWJXBA9i/pfjOu4lhAFoIGsemw22vSqu2h4bXNDiwy+1AMMudY2OQG kGZbZTyE3OPqJtB5xGblHvfK8biypthUkrJnxjCmzu0sNa6zzvljyNuLfeZWB2qb0Lna hcL5xosAcEr8mi3s+KRpBCHK+BAHEDeEJ+Y14DaEMQC9kuaOXoB7uIVCPtVczZ1m7Kmi K5tgKb7cyiX+lC6dGaJnAGgt0XMcCkHSOkDpiMNctPUiuLldVPcXioK5f8qVi55PfBud B5//APuDT0jGQPaaILZJscq5ojR3hMpKBh3mMKO16tM+qqIUlA+AtKgqn2CtA9l6n+cX YUVg== 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=rOPyuBxmGLYe4ZareXpTLr8PO0Ig8l2ByIn1PuC+9to=; b=C3I4lOUUSjTSW9kYlIpwF6IVqS3tC8J1ry4CW3T+T3Yz2WNbEomhM2cYv7b5d4TQ2f yjnRLzLBo3S3YJkY1gm/xtagxDF9tgACgCvX9JTFGcCyhUP79MHNhmayFrSzGtubWZ+R YzoUUiqe1inhi5WkP83Vl1FzFWHR3UJXH2+qIZALtzuuwj061Hul4ONO27hB6vYB6fOb OlyIAOdPBreOl7GiuEkjKs7XQ57lP23Cr0bAh6qOTUXfohe63IUaMCzFum5BLMAVt/6T PhBjQwKrmexDVhvpn7cy2UGKLMq1WYhpFZOSD7SLaCb2UA50Me3NIXHBcs9Oyj83UScu IEtg== 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 x128si1076307qkc.234.2017.09.05.12.07.01; Tue, 05 Sep 2017 12:07:01 -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 4C34B61E02; Tue, 5 Sep 2017 19:07:01 +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 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 7DA146074F; Tue, 5 Sep 2017 19: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 19E1961D9A; Tue, 5 Sep 2017 19:00:36 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 569C160AD0 for ; Tue, 5 Sep 2017 19:00:23 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward102p.mail.yandex.net (Yandex) with ESMTP id CFC584305408 for ; Tue, 5 Sep 2017 22:00:21 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3wHFDujMIk-0LRinEej; Tue, 05 Sep 2017 22:00:21 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0LEm5i7k; Tue, 05 Sep 2017 22:00:21 +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, 5 Sep 2017 22:00:05 +0300 Message-Id: <1504638007-2671-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 9/11] helper: test: rework build system 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 - Stop using extra libraries just to create a test executable - Stop using EXTRA_DIST to distribute headers, include them into _SOURCES - Stop using unnecessary dist_ prefixes, sources are distributed automatically Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ helper/test/Makefile.am | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index e30a1e71..983e2c68 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -44,15 +44,13 @@ if test_helper TESTS = $(EXECUTABLES) $(TESTSCRIPTS) endif -dist_bin_SCRIPTS = - test_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -EXTRA_DIST = odpthreads_as_processes odpthreads_as_pthreads +dist_check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads -dist_chksum_SOURCES = chksum.c -dist_cuckootable_SOURCES = cuckootable.c -dist_odpthreads_SOURCES = odpthreads.c -dist_parse_SOURCES = parse.c -dist_table_SOURCES = table.c -dist_iplookuptable_SOURCES = iplookuptable.c +chksum_SOURCES = chksum.c +cuckootable_SOURCES = cuckootable.c +odpthreads_SOURCES = odpthreads.c +parse_SOURCES = parse.c +table_SOURCES = table.c +iplookuptable_SOURCES = iplookuptable.c From patchwork Tue Sep 5 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: 111718 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3245712qge; Tue, 5 Sep 2017 12:11:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4iekCZdwsLAoJ7pvkkTJ+BcCtWME4vzwV//kDxSocX8380LSDUoYvIBBy5W77mMBbQsqDz X-Received: by 10.55.146.198 with SMTP id u189mr95288qkd.317.1504638679621; Tue, 05 Sep 2017 12:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638679; cv=none; d=google.com; s=arc-20160816; b=SDghUIaOwazL2DdrfmywozYSx0yua/HDd6FCUyPTr0wnRp6iM4q6pYt4ATEAFvNAbD OAp0r4Fnh0Y7iF8qkLNbrXZE1RCvtgglYMmWl6rUYxRTAYPYJZ5bt7ojnlV823E8WUoM r++KHCyn8qOdQ/6CKSveT7D+MdzgFwfRRkZXKgEwcvR8YVY1hnwyMsekU+ASLmq144/e Bp2J0qyE1D4BzaWo7F9pHbVyT4EzlmRINpx49WPcdAoEwJiC4+Ti+y+CiT6r5Snqf7KI 3K7OGMVq8oARmWWj54Ii0em1RU0vBUlzwjSI6ef+gEDEqp+fpHz7TtxeFZ482BJkql7t rhWw== 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=HTGZaCwH3bqFu0GBO17fDe0mpO1M0LTzmsD2uHNQStI=; b=0Dl/TSwIpaVaGeyCfTQ2Bgng/st8l07tuSukC8gCIWEWP0oChltdnvo+R1l811qZe/ Y/aecgtxczQLXM0lr+GnqNxSkHPQLjqKQ3yUZonLguNajYycKaNVTQWimlFYcfo0BHOF Er42JJsX07coI/AY9UaT81B07019I62PiE4F6vclnBH+tO7b0OFVdMbmcNxx2wO6pPY/ 46ZjpXMV6wgsR+u7a2LXROU1Dyll85ujbrR8QTlenb1ona5X8mCx/8OpjinxIV5cT6af 0m9gq8nIE/deAOeecHT/1ErKno1Rd+sQcVjTJXjMvxbxpIvhjYyIfKbAsCFNHCTEnjq7 FaJQ== 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 e62si1032655qkd.501.2017.09.05.12.11.19; Tue, 05 Sep 2017 12:11:19 -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 41BE7607AE; Tue, 5 Sep 2017 19:11:19 +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 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 A64F662C2D; Tue, 5 Sep 2017 19:01:32 +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 23A1361DE2; Tue, 5 Sep 2017 19:00:43 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 7578060F42 for ; Tue, 5 Sep 2017 19:00:23 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 773022D83F74 for ; Tue, 5 Sep 2017 22:00:22 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WWO6C0bMaw-0MPmaegF; Tue, 05 Sep 2017 22:00:22 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0LEiWKCN; Tue, 05 Sep 2017 22:00:21 +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, 5 Sep 2017 22:00:06 +0300 Message-Id: <1504638007-2671-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 10/11] test: build all tests with -static 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ test/Makefile.inc | 2 +- test/common_plat/miscellaneous/Makefile.am | 2 -- test/common_plat/performance/Makefile.am | 7 ------- test/common_plat/validation/api/Makefile.inc | 1 - test/linux-generic/mmap_vlan_ins/Makefile.am | 1 - test/linux-generic/pktio_ipc/Makefile.am | 2 -- test/linux-generic/validation/api/shmem/Makefile.am | 2 -- 7 files changed, 1 insertion(+), 16 deletions(-) diff --git a/test/Makefile.inc b/test/Makefile.inc index 8bd21432..a45fcf87 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -18,7 +18,7 @@ INCFLAGS = \ AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS = $(CUNIT_CFLAGS) -AM_LDFLAGS = -L$(LIB) +AM_LDFLAGS = -L$(LIB) -static @VALGRIND_CHECK_RULES@ valgrind_tools = memcheck diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 48240efe..5f2cc53d 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -7,6 +7,4 @@ endif odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS) -odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static - odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index c67de749..79e8e39a 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,19 +24,12 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -odp_bench_packet_LDFLAGS = $(AM_LDFLAGS) -static odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_crypto_LDFLAGS = $(AM_LDFLAGS) -static odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_perf_LDFLAGS = $(AM_LDFLAGS) -static odp_pktio_perf_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_l2fwd_LDFLAGS = $(AM_LDFLAGS) -static odp_l2fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_ordered_LDFLAGS = $(AM_LDFLAGS) -static odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_sched_latency_LDFLAGS = $(AM_LDFLAGS) -static odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index a9448b17..3e29298d 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -3,7 +3,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common_plat/common AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common -AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_PFLAGS) diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 5fb6afd9..2f38e5c6 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -8,7 +8,6 @@ dist_check_SCRIPTS = vlan.pcap \ test_SCRIPTS = $(dist_check_SCRIPTS) test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) -plat_mmap_vlan_ins_LDFLAGS = $(AM_LDFLAGS) -static plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example # Clonned from example odp_l2fwd simple diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index ad5de50b..eaa8bdd6 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -5,9 +5,7 @@ test_PROGRAMS = pktio_ipc1\ pktio_ipc2 pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc1_LDFLAGS = $(AM_LDFLAGS) -static pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc2_LDFLAGS = $(AM_LDFLAGS) -static pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index 6ff77b00..962450e5 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -13,12 +13,10 @@ shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h shmem_odp1_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) -shmem_odp1_LDFLAGS = $(AM_LDFLAGS) shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h shmem_odp2_CFLAGS = $(AM_CFLAGS) \ $(INCCUNIT_COMMON) \ $(INCODP) -shmem_odp2_LDFLAGS = $(AM_LDFLAGS) shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) From patchwork Tue Sep 5 19:00:07 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: 111719 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3247194qge; Tue, 5 Sep 2017 12:12:30 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4zoiWhIBMMcSaHoP17MScqVo/UE6qvXr8SCVDx3Zaz5n4sP5R8jN/2FZyYZo6wWtPLwZ3r X-Received: by 10.237.40.97 with SMTP id r88mr206641qtd.178.1504638750371; Tue, 05 Sep 2017 12:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638750; cv=none; d=google.com; s=arc-20160816; b=FdQHPREkz7Axit0BLkx5LL+x3c6f0+IbRwyuKnS6HiM9os+N1qgOve0gP68VyTd+3U RKZ6S3JR3dyDdmBo/sPU+HoPd4ckdXKmMV+ub2XDc7fKYm+U9P8+ONeLvWEQfR90sg7Z j3lN/mxDlZvMz7Qcz65rY3qCDp/7H+lb/2AlIvEZ1XCA+V6FPmVqKecRNzGPm/ff/kCr Mw61rRbAQ2XdruFqX661NHLoVtrddXmdbCkRJhoZMtFL0tnpz11D8FGSLp5w9DcnAqkh QE7/14a9NG19bCx6trcZCB4dQcEesnQxkfvqht9Fx7W73HsoxyuBOrMg9DltVwLZgjuP fbhw== 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=lP/qUaSo6H9Lxagpp0ZbWqIu1NXm0t/7nv5tmVb6MKA=; b=UW5SZvbHG1OTmWSs5yg2xDh9xNPr414+vcJgj8GHdjTbDH08wX3juygIEKW+71S1Xu RUPe4goO+cwxZGrfmAO89QP5dKITN1l67Wxxi7kORscMX7Bll6eMlmGp8D+KQ8XWQhrS 3HVjdIXVlteiXJCJ3mPvao81Dslf7vNTBeuG7698FeIOEJX3ddOP6MoyOZm0l4+KIBMB Dj2lxfUz0n4tbtIWXu+GjWDiXjsQhL7HqVliQb4JRCkygegUHR0WuOV7Dih21TI1GxAz iRTPepOKCd5cq2zHVAVj0PT+c1/CibikrgaMYIr+RmJhSzD1r5a855Bz1taKCw6CtIGQ MyzQ== 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 v62si1090454qka.267.2017.09.05.12.12.30; Tue, 05 Sep 2017 12:12:30 -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 116C462C60; Tue, 5 Sep 2017 19:12: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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE 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 E6C0762CFA; Tue, 5 Sep 2017 19:01:38 +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 3A5DC61D9A; Tue, 5 Sep 2017 19:00:43 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 5E12C6156B for ; Tue, 5 Sep 2017 19:00:24 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 57CC656033C1 for ; Tue, 5 Sep 2017 22:00:23 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 02UA2pjumU-0NRm0ITY; Tue, 05 Sep 2017 22:00:23 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0MEW2vrm; Tue, 05 Sep 2017 22:00:22 +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, 5 Sep 2017 22:00:07 +0300 Message-Id: <1504638007-2671-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 11/11] test: misc rewrites in Makefile.am files 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ test/common_plat/miscellaneous/Makefile.am | 2 -- test/common_plat/performance/Makefile.am | 8 +------- test/common_plat/validation/Makefile.am | 2 +- test/linux-generic/mmap_vlan_ins/Makefile.am | 6 ++++-- test/linux-generic/performance/Makefile.am | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am index 5f2cc53d..7d42b07e 100644 --- a/test/common_plat/miscellaneous/Makefile.am +++ b/test/common_plat/miscellaneous/Makefile.am @@ -5,6 +5,4 @@ bin_PROGRAMS = odp_api_from_cpp$(EXEEXT) TESTS = odp_api_from_cpp$(EXEEXT) endif -odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS) - odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index 79e8e39a..a61addd4 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,13 +24,7 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -odp_bench_packet_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_crypto_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_perf_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_l2fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_pktio_ordered_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_sched_latency_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test -odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test +AM_CPPFLAGS += -I${top_srcdir}/test noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am index 5d525fba..32854378 100644 --- a/test/common_plat/validation/Makefile.am +++ b/test/common_plat/validation/Makefile.am @@ -1,3 +1,3 @@ -if cunit_support +if test_vald SUBDIRS = api endif diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/test/linux-generic/mmap_vlan_ins/Makefile.am index 2f38e5c6..e42b5254 100644 --- a/test/linux-generic/mmap_vlan_ins/Makefile.am +++ b/test/linux-generic/mmap_vlan_ins/Makefile.am @@ -1,14 +1,16 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation -dist_check_SCRIPTS = vlan.pcap \ +dist_check_SCRIPTS = \ mmap_vlan_ins.sh \ pktio_env +dist_check_DATA = vlan.pcap + test_SCRIPTS = $(dist_check_SCRIPTS) +test_DATA = $(dist_check_DATA) test_PROGRAMS = plat_mmap_vlan_ins$(EXEEXT) -plat_mmap_vlan_ins_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example # Clonned from example odp_l2fwd simple plat_mmap_vlan_ins_SOURCES = mmap_vlan_ins.c diff --git a/test/linux-generic/performance/Makefile.am b/test/linux-generic/performance/Makefile.am index cb72fce9..0b5da671 100644 --- a/test/linux-generic/performance/Makefile.am +++ b/test/linux-generic/performance/Makefile.am @@ -10,4 +10,4 @@ if test_perf_proc TESTS = $(TESTSCRIPTS) endif -EXTRA_DIST = $(TESTSCRIPTS) +dist_check_SCRIPTS = $(TESTSCRIPTS)