From patchwork Thu Sep 7 11:59:56 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: 111892 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp83840ybm; Thu, 7 Sep 2017 05:07:48 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4zfKY0jSydMAErTb3ctNnh/mzWYn86iBNiTT7zUzAgYVf4i4zEjxD7SiPsVYr6sHcna5FJ X-Received: by 10.200.42.77 with SMTP id l13mr3178247qtl.169.1504786068537; Thu, 07 Sep 2017 05:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786068; cv=none; d=google.com; s=arc-20160816; b=G6OYCP75XE1FTNQfmagNy82hhmIOQumlsaMN8ROsMaJIWZumtWSaooGtMjRq9Gld4v SGtSaa9g1Atoeg2le/QDi31pRlyo6dScvzH+ZDIDqkz7p8LyQWIuyLVN0R6d/iCY07Di sH7pl0yt9ilEeoO6T/KSwaidNeEL4BAK0Aku/pKpfkNj93Wxgqp3n8Cjjj8CX79ss0vJ 8VygtZyfVwI+d0Vj0pUQAdtb66zCO2kFnXDBS1Sl3ku4t8hibJs3BnKPO0rfHIG6TUud 81xThcWHyiIt9CnmcBgGNXMWrAyJsdc/1IiO8UpsGmBH8yUJD1czZZAZtYbVHyFcMDf/ wukQ== 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=sdCZvVypeBoeLLsJBi/xJ+sdIwZV8bHjPrzOqygdlNc=; b=XQAFpKKPSoxyp1YfCMJrTDhszBR4HDdINDlkyaG/U2oXCtPxNELYd9rueiWz8zaQD/ YXUtMMmF4wytuKTCWFm/+4z9bDLiZ4QBwaAz7hwtRWFiMNW6sXATd6XBBqSnWS4mq0tW mWwFJZx2G5efBNukafdr0yk8pcb+wvUWvbGIjSCrQoIkRy1UrzFReo1scDXuuluGazRN fqD+S2EhAiXHN6M9chjAQFefC4D2L2HNn0yhMsSVxXy9Gh5BtsBIGsVGpt8+yMwoC536 RF+eOuQN4/a1V8PM+QlvYFW8g84Vk6xbT4KI1gfOtYx42fk3jDA53dhT2a+X/IfzGB7L PsBg== 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 v18si2271120qtf.423.2017.09.07.05.07.48; Thu, 07 Sep 2017 05:07: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 20BAC644D4; Thu, 7 Sep 2017 12:07: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id AEABA607E1; Thu, 7 Sep 2017 12:05:57 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 264C3644D2; Thu, 7 Sep 2017 12:05:45 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id BCBCA644E3 for ; Thu, 7 Sep 2017 12:00:27 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward101o.mail.yandex.net (Yandex) with ESMTP id DFEBD1341B9F for ; Thu, 7 Sep 2017 15:00:25 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id qPBVLgIDxB-0P0mbxLp; Thu, 07 Sep 2017 15:00:25 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0PdGdCsm; Thu, 07 Sep 2017 15:00:25 +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: Thu, 7 Sep 2017 14:59:56 +0300 Message-Id: <1504785609-27545-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 1/14] travis: drop ubuntu-toolchain-r-test PPA 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a14974c4..5a32ad5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,6 @@ env: addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - gcc - clang-3.8 From patchwork Thu Sep 7 11:59:57 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: 111893 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp86270ybm; Thu, 7 Sep 2017 05:09:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCL+2F86eCSfDugYATXstvgA01rR8jTZIu+dKseDDDWa0Yi4BBbJTo6OLgMJaqdrY2HoUr4 X-Received: by 10.55.81.69 with SMTP id f66mr3004498qkb.231.1504786182158; Thu, 07 Sep 2017 05:09:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786182; cv=none; d=google.com; s=arc-20160816; b=uImYmQTWBoweAQ+tuu8nfCgZ6SW2i480UKNSyYlG0ikVAcZ5nzX7LimxqGb4Zp1OEb V82O2i01v622JdiG0sjl8FwKW8tV/r9gdkl5hcvUhk4ettTJNpyd1Drc3t0ihCFbtk7Q FUf1c1YUgO3aYFXWO+cQ4eEW+MaOt63Sc8QGAbE7TYVXnxA95F2qsPquVW9Ek+o8htX2 krvQVCRqqaqmiw3HyZt/Ru4ADuTzRFHHnN/CPHt+5/htvZ8SFJZOCPhXAuCiEpz0dqF8 +OCan+FW6iEsl/Hkw5ANDDVd0uLbwFHfOhkeqv6f6KjVZg8oCR53/us7l/w1cap1+YAA Vg5Q== 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=z8IofdN7sC42YE5iCXU7LQn+1Vxv+Nw62HoYflOLTp8=; b=ArDqJtJWm5vPWJpOUU++GFe9fQi6b+Lb6ysOqPCd25HndEQL+nQT3eTM6uWPJt7yWO yMeB+SuGkwqjr3eZBEW9mhc28o74xnNWrSNwlUr6Sn8IP1YuoPE0s9wB5ywbW7R5etkR eujV4rFGSBnX6ySiUMQXPNVAvRSA1Epp4hRPdFLJbfejXRbKPYYuojQipm8ubE8QuuiD HC4ea8vte/5FsfImw2ZQkLQo088PaTMbmKkWaSNc0RuopHT16YyjwVb2EVMXbR4PTlnn hUwqT6iSr0H6wbTICGrdJzWat4/GErVvrRwttKFpZar8YCLPo11QVjfdHZos9VMQf4xW LDdg== 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 q185si2774963qke.61.2017.09.07.05.09.41; Thu, 07 Sep 2017 05:09:42 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id C42DF65BEE; Thu, 7 Sep 2017 12:09:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 28D1F6093A; Thu, 7 Sep 2017 12:06: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 52C0560C29; Thu, 7 Sep 2017 12:06:11 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 5E9C7644E4 for ; Thu, 7 Sep 2017 12:00:28 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward104p.mail.yandex.net (Yandex) with ESMTP id E52FB1836F9 for ; Thu, 7 Sep 2017 15:00:26 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1OjSZpVDyp-0QnmQMgr; Thu, 07 Sep 2017 15:00:26 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0PdqaSvf; Thu, 07 Sep 2017 15:00:26 +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: Thu, 7 Sep 2017 14:59:57 +0300 Message-Id: <1504785609-27545-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 2/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 11: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: 111897 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp91725ybm; Thu, 7 Sep 2017 05:14:03 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4GMjwHAYPE+CnXtr+waGbRkT5bYzJTi/V8D5uN1xFzaPEYU7AZ6FF+IsqLnVcv21IItl9D X-Received: by 10.237.63.15 with SMTP id p15mr3423648qtf.117.1504786443638; Thu, 07 Sep 2017 05:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786443; cv=none; d=google.com; s=arc-20160816; b=oFcTXX2DMkhpp1dNgda9NMUgfPGNwDKkzNGBkP/Fb5SFeAOyPur7Sm+reo1YAFWLBD 9nSot5eUHYFWXkWguC1jFLT6e34tGLe1YYuXfmrMhK1t4/iIHVNJo2nUgbd988WfxtGS wiUem0BX7Z6Zr1kdr7vtH6c/40gqsCzP657TTPs3+adXDr5yUOI9MZ6Xu+9ghgFzhUGR 8F3Gk1NyB7WKjfFweJACOGlqTNapEKTZwIo0bR0atlepEkDOne0mFXy0ax2qLk54t8qT aqlc2PDCj35o0Aa+q0UFcJMnPiYnLKu3NaG8tIgzQ538zSZeHBLORe22uQtGbaZlXYiH yIrA== 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=uwovueHWIcwyX6aQShxg2xLPjqmCrA7kEIIJODdz36E=; b=tzU/xkRNEbp3QfMSJ9p58mTo1AqhtnncKi/gZJznrPaTzsghVJS8oqOhJnAwXDOm/S zFMND7g2BMewMpvmgsr77q3B9rFfXGVyFePlBfWXnBH/kzZnLpBp8/QOxon+mWDC+xe7 Avwa98XGjNaP7B/Yyr3YP6c2+9CsfQAAJBF9jXB0WPbrL3BFSGYj3wHpnGDjQGneeabY WzcYSg39MBfABwhVVskrlnB8bL4JyfrWp57eoFbEbvZIPWFOA2U9vAAM7bL5wHBtXilx hvOSa9wghyV7uekm6tbfPAb6hQg0Tq0iGUmWfQR7lwQhhnrN6B636tOSfzt/yeOiCtei Avhg== 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 p123si2558690qke.233.2017.09.07.05.14.03; Thu, 07 Sep 2017 05:14:03 -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 51F1A64FD5; Thu, 7 Sep 2017 12:14:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D706B644DD; Thu, 7 Sep 2017 12:06:46 +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 DEEF76081A; Thu, 7 Sep 2017 12:06:14 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 562B9644E5 for ; Thu, 7 Sep 2017 12:00:29 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 85F4F5A0470B for ; Thu, 7 Sep 2017 15:00:27 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xj6ntAlQv4-0RLihKLI; Thu, 07 Sep 2017 15:00:27 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0RdG4Ani; Thu, 07 Sep 2017 15:00:27 +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: Thu, 7 Sep 2017 14:59:58 +0300 Message-Id: <1504785609-27545-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 3/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 11: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: 111896 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp90019ybm; Thu, 7 Sep 2017 05:12:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBBxUi3uIVCAU9nM8Iuh/4YgLk3eYpVP6m09Jr2PeG3nb3wnOrRr3FztSY9eQjPAzSLdWIH X-Received: by 10.55.82.197 with SMTP id g188mr3231109qkb.240.1504786360830; Thu, 07 Sep 2017 05:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786360; cv=none; d=google.com; s=arc-20160816; b=MHhOYaGkWZaOdjXhqMR2bjgPzvK+851sMFVgCUrgUG4fVz0QKT1vR5vG0vJ15t03qb srz6jzCYvWhz06dBcBkU4ZfUrMI1kIeV2TM9+djCaqnGn3yEprh2BjaJPAfoKC95X+cL ZO/awHYueGtcL+q5fZ/k7CdyqhP2MQzoTfrD+IXzM7bv0ENj8XeqZddyhJKNMy+LUn/S AL9STwfPP2LWxHVomQV+eXBJOabj99CQefLuiAwnQJL4oH45u99+zDsOj2b9MOG8cubl 3MQ7rovbCtGqvz6SE0e5aW0J69DVOId1xEqQzqbY3Q71UD6NL+QN/T8DabFWfxHsDQ/d sQXw== 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=4kbuhAwMWhF0LSJqK/eF7qbJCvC4v3v+GobiAHc6drY=; b=B1zGN+zI4a85pBwmR2drCMw645Jzoi84qL+PGsJi7KvJ2ugTQSUhhS+hJTYMMj5yFy KWdrTZPxydGA4CzmuJKvWI+/hugOYLwp1lYI6VwtVLeN8HkbBelGYEjoj7gYkDekfgbh YCK3rs2Hkd51xJ+/EJS1Jft0vbD4UTm3Bjni3S2lLwadLcXk9W7sZgA5jSev3+AfO61a hXXoOptBToCvvuprBp8Yz7thyr+GCTqBIthL1PoqRIGMpIaNszinmLHSu018hyb5ZeqI lqTCD58vu2zW5jinkkFTi/yqKiHBF7rJNxz0ynu9yMAgTVTa7PuoWyFcNcECr1Zfba2w 50tQ== 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 b41si2865232qtk.166.2017.09.07.05.12.40; Thu, 07 Sep 2017 05:12:40 -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 6CBC660CE5; Thu, 7 Sep 2017 12:12:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8DBC2644B3; Thu, 7 Sep 2017 12:06:37 +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 7AB3F6081A; Thu, 7 Sep 2017 12:06:14 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id B67CF644E9 for ; Thu, 7 Sep 2017 12:00:34 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 658571805397 for ; Thu, 7 Sep 2017 15:00:28 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8ihPp2IUSf-0StKOUnP; Thu, 07 Sep 2017 15:00:28 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0Rd4BQrG; Thu, 07 Sep 2017 15:00:27 +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: Thu, 7 Sep 2017 14:59:59 +0300 Message-Id: <1504785609-27545-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 4/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111898 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp93390ybm; Thu, 7 Sep 2017 05:15:23 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA0JdQMKhZ0aG2egkr2NIaXvamD2sl9IV0gz2CrNv3PQ5CdNALo3KtHuEodPE2W7yUSo5je X-Received: by 10.55.0.213 with SMTP id t82mr3563282qkg.286.1504786523498; Thu, 07 Sep 2017 05:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786523; cv=none; d=google.com; s=arc-20160816; b=bKTw1lqDmCL2yZQGA+CtAzm0IlFYNhmMB8vTog3ylL9Vv+w+uef8C/FhdEL0ncSNmM 6Asd//YW/HSbg2Gd9fY8EnR5HA36ce7Rh8T8HABfU8LvgnUfdmLJXRHC8GRsk5zyI34Z nFJWGhgXKGP0HAb0fb4SD6ayZ8z7DJXjyJWbsp8bjGvBJMFibAtwwt3T7wmVkCLgArid R8K0v25NRkEQGBh9fMe97xCowHspZitbXmq3se1EXEQVkqeeNI+YOpgwamh7tkpQu/Rs R6g1ITsYldsz1u4v36MtUN+PW6e8KK9AQQ2fQYaSNGGZ3xldEJESsLoFN6cWmKA0TH59 EZ9A== 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=6XZA2y+fJonYxL+m0AHaTNcnEW9d86HyIm7QUquGN88=; b=pkQyeOY3ymbG4gd6PhVkuKnRcAZKmJp7xYs7EuRuEBt652pV/1NO8B9adm0RUXPU9e c0zwqSvbiYQtqj6zxD6hWjATVeewLQld6ZHLWxeiOhOjy+Hkz4DnooukIfUoj/CFSwmY 9wfSw7wdo5mskL6pri0bDBaZU+fLkXxQmeIzIhgR4SvFdYehrCW9ex+2WaCnwvfYvFbt GRWtQYb48NivEXSeJ9V3MLU5Kd14vGwEi4qWOdDvWmQBQ5M93JEpgp0lz2V2YnNXWdMX Aq6gZlKI53dxRvqoKffNYl2PeWrHc77B6ZEegJNvC+F2uEH5x6VLPKNC6aN1bIJbnVtf Om+g== 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 w128si2567494qkd.32.2017.09.07.05.15.21; Thu, 07 Sep 2017 05:15:23 -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 A860764FD5; Thu, 7 Sep 2017 12:15:21 +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, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 27442644E3; Thu, 7 Sep 2017 12:06:54 +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 748E76081A; Thu, 7 Sep 2017 12:06:15 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 31184644E6 for ; Thu, 7 Sep 2017 12:00:31 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 0ED4D2C85F43 for ; Thu, 7 Sep 2017 15:00:29 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id C3ijTexJHb-0SW8CkJF; Thu, 07 Sep 2017 15:00:29 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0SdS0SKF; Thu, 07 Sep 2017 15:00:28 +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: Thu, 7 Sep 2017 15:00:00 +0300 Message-Id: <1504785609-27545-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 5/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111895 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp88181ybm; Thu, 7 Sep 2017 05:11:11 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5TjzpEFaULfDfc1aupxEYuxNJG5SEOn+8rZfrNNm+oDjuujEM0v0SRHSTAZZdlyGS76Vdr X-Received: by 10.55.114.196 with SMTP id n187mr3079995qkc.129.1504786271344; Thu, 07 Sep 2017 05:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786271; cv=none; d=google.com; s=arc-20160816; b=grnB2Mg5VMbFDz/VXhvcxCr8BhqN8BJSGpls3BnaI2OuSUCaf6fZfTdMa8SktmewvC zDNgz8X6KCp52x8tr/euszBjVCswWkw+uc9YWI7CyfQvcXYoZMwhdjBJba8314T28KIy 13w3mCyFj0uIhNEIbiL/K8LBffuzg9ZDNt1caX4Gg5A/XICuKQ5O6yptv11sdr5pil1A cEj3hAE338wxHtTyVh4Bf1VyrWb3P/+FTYo56xpHp9J6/yu9pPcjKEFMDHWtMJhwANA0 /QgS8fSfH2qhEI3XXosg/kzVLYPYFm4RDHhq/Y4i97q0qZ7wHPzqy2NQZnBNr3Ex82Sk x/LQ== 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=jbdJWeksSedsoKV/8WqyGD5wR2iES2JEZjfy5QrQG58=; b=LOg+/HQabeWKXQLDsY6x43Ntp+Ep9qzShDN3WR8oParB/0afEFYscFEU4vaBh649Db MFfCHImudgnXrJft9bSrnOMvXnbxE0/CvLKJ6DDxQewZv/c+eUMq+Tatf0xhWei7OJ6Q MatcHAvFhEWYg0+kOg4/UHUCVwFh1/sd+3J7KXy/HLiagC0JtrCgxAtsLLmbTsqPSAmJ xT2S3fKy5R03E776eNmaJAW4cMG1mK4fteySCz9kRAUWdORPwxRVh2oVJ4e2WkeG/ggP 0XcK7OQEL0G2Gy4r/3btqlylkYrRP5m+hfVqbZ9ubSItjxthwwHpl4p63sfhz8DRWpU1 kn+g== 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 x9si927159qtb.241.2017.09.07.05.11.10; Thu, 07 Sep 2017 05:11:11 -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 B04CF65BED; Thu, 7 Sep 2017 12:11:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 65C0F60C9A; Thu, 7 Sep 2017 12:06:33 +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 6489F60C29; Thu, 7 Sep 2017 12:06:12 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 3F5EC644E7 for ; Thu, 7 Sep 2017 12:00:32 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 0E21A183EE1 for ; Thu, 7 Sep 2017 15:00:31 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id za483ztFtu-0UrKC7op; Thu, 07 Sep 2017 15:00:31 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0UdS3ELc; Thu, 07 Sep 2017 15:00:30 +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: Thu, 7 Sep 2017 15:00:01 +0300 Message-Id: <1504785609-27545-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 6/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111899 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp95379ybm; Thu, 7 Sep 2017 05:16:55 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC9btrdMQ/lv6fjfbVWrNDHlnZv9IzWjNvxA6yN/JH7Zf2wOA7hOiK2PPVKh5uW7p8qqMsG X-Received: by 10.55.31.211 with SMTP id n80mr3071499qkh.179.1504786615719; Thu, 07 Sep 2017 05:16:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786615; cv=none; d=google.com; s=arc-20160816; b=wxauPdCxLjZX5JWiNQaPqk1xSwDHcT0L+Px0cig8pAhjm5ypwYOM7nyM1oQzB2+ngr fByQ2AZY8SROZol8yEJ55qJVHA3WZW3bnwrVs4NOKI6SbIoI/KCssuxpznQwmAvK4689 AqJWWgVGaLl1pC2Xy3lTwIBd9AUDvfTnTUS7ULo6MaGRRY9LJAslc3soPpLwyEY0297V nvXw87DIbx4YJffuHgbyVOaNVq5Cxye6Znt4udIA/HjAsducfn0lPvcCYxSWiwV/Fiez LqFNbZL23SDUocrGGOBq5VqSsQpUDwPP67ClVpTokatP5oB09fTOIcxKXfB/ounA/4/G BSqg== 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=ZNJXCEtgPfzl9ZtwfU98MirQ3RjcCqgt4Pj4FFzvib4=; b=RPk39e2R4JNfsWLi3m//9v8Ykv0QM4xf9C+SiaQPceO1J2yTQPnFwwAqh59elWN/dS +jVI4Y3l50XiYvuVEqNeDP2NNWhm/dyNmZdFlQjOXQrn74avbmdPfvDx+jL9BLLzx5H3 zX8R++ouEegBqjpaYBnyn0p2RHOpIWikeiV8itNrev/L/t54WExpWfBIp0qJzxe05Cb4 66onqUXTjV+zaV/DqLet3nLhwrlmzlPkzq/OzkjMpshYRZT3rlo3oCjUfVXuTItiFTM1 2i/xMxz/hBI+M0efIGDBe2KQbm1kPpEMPgovhiznc1xq/Cmm+8w/Yl0s/ogLwHHOJWrq TSzQ== 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 g123si2624156qkd.167.2017.09.07.05.16.55; Thu, 07 Sep 2017 05:16:55 -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 4F943644E5; Thu, 7 Sep 2017 12:16:55 +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, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7E04A644E8; Thu, 7 Sep 2017 12:07:01 +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 BACB26081A; Thu, 7 Sep 2017 12:06:16 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id BD02A644E8 for ; Thu, 7 Sep 2017 12:00:32 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward106p.mail.yandex.net (Yandex) with ESMTP id B9AC12D820A3 for ; Thu, 7 Sep 2017 15:00:31 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DVioU1CkkQ-0VrWc0j6; Thu, 07 Sep 2017 15:00:31 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0VdSdigb; Thu, 07 Sep 2017 15:00:31 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 7 Sep 2017 15:00:02 +0300 Message-Id: <1504785609-27545-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 7/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111902 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp100064ybm; Thu, 7 Sep 2017 05:20:56 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6fgzVzQEmXxcxAKgJGSVklSWTywE/rTZRka8dKvL68JBmos0rwx2roRhMTvMKcu8fUmWIo X-Received: by 10.200.58.165 with SMTP id x34mr3279064qte.261.1504786856819; Thu, 07 Sep 2017 05:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786856; cv=none; d=google.com; s=arc-20160816; b=TJlOaCD13wuVFgPEc8sMt314GBdkpDZHaU2Z0VnuLR3JXOXwYDQCTEZYdjWqEOSBXS UqNaq51m/vxQY41+vgoxYW8U2J8qIzYnwBFrmOwKtuLw6YzYOXJkL4+7JU7abl/JsTsu f0Blt4z/nPdGq+JAXbxM4yYIBGMbqK2S957f20yqXR1purozoVipseOQhSGHN4BVhDnq rseerXgwWo+vLYa4vfGDAZFNX1SA89nQ57wH4R6Io3bNh3uvZQOG9gTYUwkuC+bfVYTX 7osNslLUltmtQYizQOgfnWbzSa40AVOZ9+T86bEVsH8CGrFEcgE+5Um/I9zJ4GAzF/Wx RjEA== 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=OusN+f9WwJvwuzawTil9SnYFgQHj3fGy5wUF4/NUcIg=; b=cbAx4I+v42QnOzb2NqiEBKjGE3G8TmPP1oQvxducl8412op8cZgygmEkEVl9v2ClAh p/VB4zYtrTxuC80fM4MkzYoBiRYh1TKOQF+wJoIfDTbXigKLpulNuB5NG3p83VhOot7n H2bCIrRbNb2FkWv+Ed2PG0g8vPxDs/WARHk0hERy2SeW1VN+jr9EnbVGTAifKXRI01Li ucU4NXQO5mt7NsAOztBZ+bxhxPCLlS9QL8Edrk0TrL85//n+33OkCV+XoD2ZudF2YzMW 8nbHjMYqO4N+ZkQGAzw6DPTLfP2DCE0ZqCFyRhGlmbZnfusb1/m7W48IeQSv5SJCrcn0 raxA== 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 k190si2584127qkc.366.2017.09.07.05.20.56; Thu, 07 Sep 2017 05:20:56 -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 5F5F26486B; Thu, 7 Sep 2017 12:20:56 +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, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 50F9265BCB; Thu, 7 Sep 2017 12:07:30 +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 8F1676081A; Thu, 7 Sep 2017 12:06:24 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id DDAE2644FC for ; Thu, 7 Sep 2017 12:00:35 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward106j.mail.yandex.net (Yandex) with ESMTP id EF96C1804633 for ; Thu, 7 Sep 2017 15:00:32 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 6w0VBMB6Ce-0WP8kM5P; Thu, 07 Sep 2017 15:00:32 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0Vd4ewmb; Thu, 07 Sep 2017 15:00:31 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 7 Sep 2017 15:00:03 +0300 Message-Id: <1504785609-27545-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 8/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111900 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp96850ybm; Thu, 7 Sep 2017 05:18:13 -0700 (PDT) X-Google-Smtp-Source: ADKCNb69nNEjESbO0zLHdjimbh5kNk4B8RegtBkmXnoj/Uv4p5lGwekaPzhqoKo+5PzJxryNWK4M X-Received: by 10.200.22.8 with SMTP id p8mr3765881qtj.54.1504786693036; Thu, 07 Sep 2017 05:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786693; cv=none; d=google.com; s=arc-20160816; b=jc67IP8CTXJPbhuX3TBPCG+IdGlzFXUgoTumaeBf+zufEo5VFgDm0RibeepaoL009+ Z1j4iFRoi9x4p7Rt/h6uoUHPkGYhdTOlESS+wjDL+aiKDfbDoY7UWskG8C1B1+eBPmJ/ TlKMfmv7Xc6mxrqmNziBOzKYNcpkKhAxewVOZqbCCxMlv7636bIh7P0b34VWIl/Qg8mO 6YM/YRuG70rwmFP8aIlKOeocN0HtuDzdx0aMPqr9SFQ2C2prrhtBoO8zjLsx9fLzLrXw CwnoZtE96eYlEv10Wk+YVlzLPkkH7DjHspQpzevL84Qt9OC41dTzmXc6X/doivu36XPX V/+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=m7ikrMUePL03QHokl3aURxxyKNwrXppIGiDQvXpnrS8=; b=vsNSFfsdQr4tWi4vdICyn5GVGlLP1PMIJtViqmjDK62Fxhgb/bTKubfHlTFpGC1vjz 5zTc1GRK0zOEvZ03RzmZIalyIVCswhTcW9yY43mUPiTmxYSBBd9Ow0kJ+zBc/ntdj4SB vytSU0lIGA6ct0+POwf+SXcPRqgC7V9GQMLb2eaRKRUO0ZFbNuhFec2EniiHNPTTQwhh Wf4M11m9hvq6znf6DkkN+Qx7AN5geOmsRS3IYFaLLEMHCSVeXJH7dOsn6Q+VockUHMpv wYbgqFKe6CRKd1NaYkOLygpqPLdQOc3Ydak4na/NwrpTYdCfi9OH1SliF+htJ9ytHQnR DJ5g== 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 y129si2645028qke.382.2017.09.07.05.18.12; Thu, 07 Sep 2017 05:18:13 -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 AA9716486B; Thu, 7 Sep 2017 12:18:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id AA130644FC; Thu, 7 Sep 2017 12:07:08 +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 4D2276081A; Thu, 7 Sep 2017 12:06:20 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 84511644EA for ; Thu, 7 Sep 2017 12:00:35 +0000 (UTC) Received: from mxback7o.mail.yandex.net (mxback7o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::21]) by forward101j.mail.yandex.net (Yandex) with ESMTP id C1AA0124640A for ; Thu, 7 Sep 2017 15:00:33 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ag9lT7fy2e-0XwGqwSE; Thu, 07 Sep 2017 15:00:33 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0XdSPxCI; Thu, 07 Sep 2017 15:00:33 +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: Thu, 7 Sep 2017 15:00:04 +0300 Message-Id: <1504785609-27545-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 9/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111903 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp103159ybm; Thu, 7 Sep 2017 05:23:46 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6HMDAXsg7nyEXrCb9Y0YduhV61wKDlTZD/Feq4kFv0z0ffNyPH0x72bZoiKOdqVg8caB9q X-Received: by 10.200.44.107 with SMTP id e40mr3293037qta.262.1504787026819; Thu, 07 Sep 2017 05:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504787026; cv=none; d=google.com; s=arc-20160816; b=LoQYpGszP+LnqxW3J3AHuQr3h6Uu+5815h3QgHuYMZKyV7ZFuu1qv75Y+ODlcH4T5f nwno4X0iyiWDoBS5l5HcUUZ1eHJ4mZTVVKtcmBvGUflEEAYPMoWExoLROvBaPpJMEtPd D8jnlnPE1bZPrNCxvXzphiI/GPyMZPkHATzFWf+SSjjPZgXeBjo21wI4497mTAaDNcQM XsWmpXPVvm+3KFVI8A5z579uGpywq4ilMT9pqgjPkAXPgAjhojrOh4BZ3KUG9W+MvbFA Ox53Ye321wo+/IbseyxPVDLys7/goDxOer6Ulx9XmmyA1LamnRSmgCwEN3+Fgay4+V+C Rvig== 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=0ZVbxZiM0RrdqOEHxCuxPP719jXsNtoKG9KewNL/E6s=; b=y0MQduPyKqQUjlSIBeiIcnKnnWVEGZjYiZhrmYI4tLFucBCO0vjXOMu3e9Xpm7eBRw V3iVHOZhGJPULywP5093wVW3n7f+9X1nC/RQ7zhiiet+HkdccvPUwVULVo9emtidORM6 PhKkWkNdbaIPb1PnGQN0dUF1QYhYP4PQrE1+to1prsTAycTxX+Ymc4ENOK/tUaQOOhEp fZUJm8YPKtijsa1e5ijlR1AIXZy2/3heeIj5beBuspA+jLNVrIBTGCVNETbzHRQv7ZUD YsEeN5LFo6D9LGuNgt5OhS+e3hnCExTvp68ydVVr6gn925nrw4Ext9kak+hrVpgu+/Y5 Yg7Q== 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 f30si2698747qta.485.2017.09.07.05.23.46; Thu, 07 Sep 2017 05:23:46 -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 6271F65BCB; Thu, 7 Sep 2017 12:23:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A86F865BD1; Thu, 7 Sep 2017 12:07:37 +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 3CC0E60C30; Thu, 7 Sep 2017 12:06:27 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 6173D646DE for ; Thu, 7 Sep 2017 12:00:36 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward106j.mail.yandex.net (Yandex) with ESMTP id D87F0180340E for ; Thu, 7 Sep 2017 15:00:34 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id kOe4icchmh-0YcGnLLl; Thu, 07 Sep 2017 15:00:34 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0Xd40wWA; Thu, 07 Sep 2017 15:00:33 +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: Thu, 7 Sep 2017 15:00:05 +0300 Message-Id: <1504785609-27545-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 10/14] test: pktio_ipc: switch to test_debug rather than example_debug 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ test/linux-generic/pktio_ipc/ipc_common.c | 12 +++++----- test/linux-generic/pktio_ipc/ipc_common.h | 2 +- test/linux-generic/pktio_ipc/pktio_ipc1.c | 40 +++++++++++++++---------------- test/linux-generic/pktio_ipc/pktio_ipc2.c | 36 ++++++++++++++-------------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c index 2004c7d2..e15d3913 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.c +++ b/test/linux-generic/pktio_ipc/ipc_common.c @@ -29,14 +29,14 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio, end_time = odp_time_sum(start_time, wait); if (odp_pktout_queue(pktio, &pktout, 1) != 1) { - EXAMPLE_ERR("no output queue\n"); + LOG_ERR("no output queue\n"); return -1; } while (sent != num) { ret = odp_pktout_send(pktout, &pkt_tbl[sent], num - sent); if (ret < 0) { - EXAMPLE_ERR("odp_pktout_send return %d\n", ret); + LOG_ERR("odp_pktout_send return %d\n", ret); for (i = sent; i < num; i++) odp_packet_free(pkt_tbl[i]); return -1; @@ -47,7 +47,7 @@ int ipc_odp_packet_send_or_free(odp_pktio_t pktio, if (odp_time_cmp(end_time, odp_time_local()) < 0) { for (i = sent; i < num; i++) odp_packet_free(pkt_tbl[i]); - EXAMPLE_ERR("Send Timeout!\n"); + LOG_ERR("Send Timeout!\n"); return -1; } } @@ -71,17 +71,17 @@ odp_pktio_t create_pktio(odp_pool_t pool, int master_pid) printf("pid: %d, create IPC pktio %s\n", getpid(), name); ipc_pktio = odp_pktio_open(name, pool, &pktio_param); if (ipc_pktio == ODP_PKTIO_INVALID) { - EXAMPLE_ERR("Error: ipc pktio %s create failed.\n", name); + LOG_ERR("Error: ipc pktio %s create failed.\n", name); return ODP_PKTIO_INVALID; } if (odp_pktin_queue_config(ipc_pktio, NULL)) { - EXAMPLE_ERR("Input queue config failed\n"); + LOG_ERR("Input queue config failed\n"); return ODP_PKTIO_INVALID; } if (odp_pktout_queue_config(ipc_pktio, NULL)) { - EXAMPLE_ERR("Output queue config failed\n"); + LOG_ERR("Output queue config failed\n"); return ODP_PKTIO_INVALID; } diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h index 334788f3..2b04b144 100644 --- a/test/linux-generic/pktio_ipc/ipc_common.h +++ b/test/linux-generic/pktio_ipc/ipc_common.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c index b1ed21b8..ee46d1da 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc1.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c @@ -77,7 +77,7 @@ static int pktio_run_loop(odp_pool_t pool) return -1; if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) { - EXAMPLE_ERR("no input queue\n"); + LOG_ERR("no input queue\n"); return -1; } @@ -107,8 +107,8 @@ static int pktio_run_loop(odp_pool_t pool) cycle = odp_time_local(); diff = odp_time_diff(cycle, start_cycle); if (odp_time_cmp(wait, diff) < 0) { - EXAMPLE_DBG("exit after %d seconds\n", - run_time_sec); + LOG_DBG("exit after %d seconds\n", + run_time_sec); break; } } @@ -132,7 +132,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_ERR("invalid l4 offset\n"); + LOG_ERR("invalid l4 offset\n"); } off += ODPH_UDPHDR_LEN; @@ -143,7 +143,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_DBG("error\n"); + LOG_DBG("error\n"); continue; } @@ -157,7 +157,7 @@ static int pktio_run_loop(odp_pool_t pool) stat_errors++; stat_free++; odp_packet_free(pkt); - EXAMPLE_DBG("error\n"); + LOG_DBG("error\n"); continue; } @@ -184,7 +184,7 @@ static int pktio_run_loop(odp_pool_t pool) if (head.seq != cnt_recv && sync_cnt) { stat_errors++; odp_packet_free(pkt); - EXAMPLE_DBG("head.seq %d - " + LOG_DBG("head.seq %d - " "cnt_recv %" PRIu64 "" " = %" PRIu64 "\n", head.seq, cnt_recv, @@ -226,7 +226,7 @@ static int pktio_run_loop(odp_pool_t pool) off = odp_packet_l4_offset(pkt); if (off == ODP_PACKET_OFFSET_INVALID) - EXAMPLE_ABORT("packet L4 offset not set"); + LOG_ABORT("packet L4 offset not set"); head.magic = TEST_SEQ_MAGIC; head.seq = cnt++; @@ -235,20 +235,20 @@ static int pktio_run_loop(odp_pool_t pool) ret = odp_packet_copy_from_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data"); tail.magic = TEST_SEQ_MAGIC; off = odp_packet_len(pkt) - sizeof(pkt_tail_t); ret = odp_packet_copy_from_mem(pkt, off, sizeof(tail), &tail); if (ret) - EXAMPLE_ABORT("unable to copy in tail data"); + LOG_ABORT("unable to copy in tail data"); } /* 5. Send packets to ipc_pktio */ ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, pkts); if (ret < 0) { - EXAMPLE_DBG("unable to sending to ipc pktio\n"); + LOG_DBG("unable to sending to ipc pktio\n"); break; } @@ -275,14 +275,14 @@ static int pktio_run_loop(odp_pool_t pool) /* cleanup and exit */ ret = odp_pktio_stop(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_stop error %d\n", ret); + LOG_DBG("odp_pktio_stop error %d\n", ret); return -1; } exit: ret = odp_pktio_close(ipc_pktio); if (ret) { - EXAMPLE_DBG("odp_pktio_close error %d\n", ret); + LOG_DBG("odp_pktio_close error %d\n", ret); return -1; } @@ -308,7 +308,7 @@ int main(int argc, char *argv[]) /* Init ODP before calling anything else */ if (odp_init_global(&instance, NULL, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + LOG_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_WORKER)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + LOG_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -345,7 +345,7 @@ int main(int argc, char *argv[]) pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + LOG_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } @@ -354,20 +354,20 @@ int main(int argc, char *argv[]) ret = pktio_run_loop(pool); if (odp_pool_destroy(pool)) { - EXAMPLE_ERR("Error: odp_pool_destroy() failed.\n"); + LOG_ERR("Error: odp_pool_destroy() failed.\n"); exit(EXIT_FAILURE); } if (odp_term_local()) { - EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + LOG_ERR("Error: odp_term_local() failed.\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + LOG_ERR("Error: odp_term_global() failed.\n"); exit(EXIT_FAILURE); } - EXAMPLE_DBG("return %d\n", ret); + LOG_DBG("return %d\n", ret); return ret; } diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c index 062ed9b7..deb6eddf 100644 --- a/test/linux-generic/pktio_ipc/pktio_ipc2.c +++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c @@ -44,7 +44,7 @@ static int ipc_second_process(int master_pid) pool = odp_pool_create(TEST_IPC_POOL_NAME, ¶ms); if (pool == ODP_POOL_INVALID) { - EXAMPLE_ERR("Error: packet pool create failed.\n"); + LOG_ERR("Error: packet pool create failed.\n"); exit(EXIT_FAILURE); } @@ -77,7 +77,7 @@ static int ipc_second_process(int master_pid) if (odp_pktin_queue(ipc_pktio, &pktin, 1) != 1) { odp_pool_destroy(pool); - EXAMPLE_ERR("no input queue\n"); + LOG_ERR("no input queue\n"); return -1; } @@ -105,8 +105,8 @@ static int ipc_second_process(int master_pid) cycle = odp_time_local(); diff = odp_time_diff(cycle, start_cycle); if (odp_time_cmp(wait, diff) < 0) { - EXAMPLE_DBG("exit after %d seconds\n", - run_time_sec); + LOG_DBG("exit after %d seconds\n", + run_time_sec); break; } } @@ -123,7 +123,7 @@ static int ipc_second_process(int master_pid) off = odp_packet_l4_offset(pkt); if (off == ODP_PACKET_OFFSET_INVALID) { - EXAMPLE_ERR("invalid l4 offset\n"); + LOG_ERR("invalid l4 offset\n"); for (int j = i; j < pkts; j++) odp_packet_free(pkt_tbl[j]); break; @@ -133,10 +133,10 @@ static int ipc_second_process(int master_pid) ret = odp_packet_copy_to_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable copy out head data"); + LOG_ABORT("unable copy out head data"); if (head.magic != TEST_SEQ_MAGIC) { - EXAMPLE_ERR("Wrong head magic! %x", head.magic); + LOG_ERR("Wrong head magic! %x", head.magic); for (int j = i; j < pkts; j++) odp_packet_free(pkt_tbl[j]); break; @@ -147,13 +147,13 @@ static int ipc_second_process(int master_pid) ret = odp_packet_copy_from_mem(pkt, off, sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data"); } /* send all packets back */ ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, i); if (ret < 0) - EXAMPLE_ABORT("can not send packets\n"); + LOG_ABORT("can not send packets\n"); stat_pkts += ret; @@ -174,13 +174,13 @@ static int ipc_second_process(int master_pid) sizeof(head), &head); if (ret) - EXAMPLE_ABORT("unable to copy in head data"); + LOG_ABORT("unable to copy in head data"); pkt_tbl[0] = alloc_pkt; ret = ipc_odp_packet_send_or_free(ipc_pktio, pkt_tbl, 1); if (ret < 0) - EXAMPLE_ABORT("can not send packets\n"); + LOG_ABORT("can not send packets\n"); stat_pkts += 1; } } @@ -188,20 +188,20 @@ static int ipc_second_process(int master_pid) /* cleanup and exit */ ret = odp_pktio_stop(ipc_pktio); if (ret) { - EXAMPLE_DBG("ipc2: odp_pktio_stop error %d\n", ret); + LOG_DBG("ipc2: odp_pktio_stop error %d\n", ret); return -1; } not_started: ret = odp_pktio_close(ipc_pktio); if (ret) { - EXAMPLE_DBG("ipc2: odp_pktio_close error %d\n", ret); + LOG_DBG("ipc2: odp_pktio_close error %d\n", ret); return -1; } ret = odp_pool_destroy(pool); if (ret) - EXAMPLE_DBG("ipc2: pool_destroy error %d\n", ret); + LOG_DBG("ipc2: pool_destroy error %d\n", ret); return stat_pkts > 1000 ? 0 : -1; } @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) parse_args(argc, argv); if (odp_init_global(&instance, NULL, NULL)) { - EXAMPLE_ERR("Error: ODP global init failed.\n"); + LOG_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } @@ -243,19 +243,19 @@ int main(int argc, char *argv[]) /* Init this thread */ if (odp_init_local(instance, ODP_THREAD_WORKER)) { - EXAMPLE_ERR("Error: ODP local init failed.\n"); + LOG_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } ret = ipc_second_process(master_pid); if (odp_term_local()) { - EXAMPLE_ERR("Error: odp_term_local() failed.\n"); + LOG_ERR("Error: odp_term_local() failed.\n"); exit(EXIT_FAILURE); } if (odp_term_global(instance)) { - EXAMPLE_ERR("Error: odp_term_global() failed.\n"); + LOG_ERR("Error: odp_term_global() failed.\n"); exit(EXIT_FAILURE); } From patchwork Thu Sep 7 12: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: 111901 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp98215ybm; Thu, 7 Sep 2017 05:19:23 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6P2inARubN5Tpqy9IwEim1cN0sy3VU8FOAMeY1qD9L4JeXACiMqytM9ftVzcISD2eN+Hpv X-Received: by 10.200.0.145 with SMTP id c17mr3321892qtg.186.1504786763913; Thu, 07 Sep 2017 05:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786763; cv=none; d=google.com; s=arc-20160816; b=bNZapXVqoJjj39r1skMZCf2w9motoDYaCc4+lKtLfPRpaCQ/dCrntid5OP5FcXeZll aMCuE6ggAn3YvVLzEd2RKJb85qEqW681mzrztSa+UHbqaLcS3mtYv2QY9MMFDi7k3VMG n9sKxkCTrXcU7/s8qTIZYjsKZOiqQP4LF+GjQfc23RhPdTjwIUXGYTEE9jcP926sZlR3 Qtb2ntnjN55TJCXXkHGFy/F5X+rouwMvuQq7U10IKIiRGM92oaCTrgRfiBdbdYoBkszP WAWRs+KvApwa5Js3s5MaF6tgr00LRslJuskfvUIBOP0gj9zraP2Gzl+909OTLTI4DPTr 5yeg== 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=Yflozi2fGeoh3MoUFdPmLW6xm7FnX7LhWgnKv+jO9JY=; b=n2d0kaIGZctUpQ79lKHjo5SZUQSARYRBMtMFdCxoaNL/K8CDtTYUzpWyWAglY2f0FI IS1z4IebKufXSzxkw5Id8AO/cLtb3mmOeIS7jvE1sfGdHL0yejLO2pwFmAXSWxOD8kwR ruUicqKk4U6uomqfd5ZfQ6oAy+IbNEsRnUY6s7FrJnRFeKzk1jFsPqPCOZo8s8o++4lp F3CcN7v1nwZS/dC9B1aO/VzoCBn8D3NkgyL/Rh4Xv1sclVj5r+rd/GtUUpKEQFXU7JbR sqTU6/R2LqMVNXkGM1XkaOcC26HI7cb4oSwut6TUKa4b90G5WJy7+34106+Xc3nw8wWK kANw== 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 k50si2696685qtk.147.2017.09.07.05.19.23; Thu, 07 Sep 2017 05:19:23 -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 964B5644FC; Thu, 7 Sep 2017 12:19:23 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0A08C65BC1; Thu, 7 Sep 2017 12:07:17 +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 E62246081A; Thu, 7 Sep 2017 12:06:20 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 4638C6486B for ; Thu, 7 Sep 2017 12:00:37 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 85FCC2A222ED for ; Thu, 7 Sep 2017 15:00:35 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id sb6bruTcqq-0ZLuI8Hw; Thu, 07 Sep 2017 15:00:35 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0YdqAUhs; Thu, 07 Sep 2017 15:00:34 +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: Thu, 7 Sep 2017 15:00:06 +0300 Message-Id: <1504785609-27545-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 11/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 Thu Sep 7 12: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: 111904 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp106578ybm; Thu, 7 Sep 2017 05:26:52 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4hlflxKvTdCtQV86Dp5mnSMMBObjobyFPDdsIsgQU1pnzU1rklwvpuaedOv+E4hP3UpbX+ X-Received: by 10.200.4.146 with SMTP id s18mr3359746qtg.240.1504787212539; Thu, 07 Sep 2017 05:26:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504787212; cv=none; d=google.com; s=arc-20160816; b=wO4gW9K8fFKHiN6cV2eqmHOPuT4wBbvFuj6aL93OJyLK7W7knNw7IY57e703oHtYqT Wg/F0/nEwXh1lleUoAkjngOzKLifORDavLAOvNduEMf9mvf/y090raCK2eNHO4J0J5UI GjjPcPT6GgRY2LutahnrPZOm7LM3uYDNDh3rUCQw0AnXfHd6BYRgr3j7Faw3PfkOIxOq E4rYIIK+uZJjQPRmM4C93NJjCbpxOfkwfvWSGqMG+rIboQ9mCmoihE2Khan3kkpV9oNl lDY3iU4JiOatxJrWUZnIEnZ3zmkx6w4DJhgEzaRZ4/bdap7H9sN8NKDD18DYEyFMWGyy JwUQ== 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=s8AkIQFDDALgnOhAH2igbVoWH1R8Er575KL3+rThg2I=; b=SHxe6hdq4LM0z8n7sQ7jrbN/YXPOjRC/tfovbyKTjMz05TUQ8iduMrzX9rKPDJ0s7m LJWL4RGv4lFEtESDmTX9QISL/7UK9+IZBE4qEOZAU4KXrclgSP5IEBe3iDpL1isHbAQU KMVPf1B5TtGYBdXIQfkbRqfJVO75GN5fIWBphKTLmKKPJ4wqpOWo9ogko9azTzzhmNo+ wXlBKxgK5m3twz67Q8cU5Bb53HXa8hveqQZK53BBRyH7dWOIlqstY5RL80jOriW7cvjh 25Tquh1oPHZjXRWODo7YEiUlxXDOqjgFWAruGy53FXxiI4iP8jEljGGtxLdW0FkSlPlP cEqA== 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 n186si2635051qkb.512.2017.09.07.05.26.52; Thu, 07 Sep 2017 05:26:52 -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 23F0D644E9; Thu, 7 Sep 2017 12:26:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 30F3E644D6; Thu, 7 Sep 2017 12:08:39 +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 1E304648CD; Thu, 7 Sep 2017 12:08:30 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 68722648CD for ; Thu, 7 Sep 2017 12:00:37 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 1A6B434C5C0D for ; Thu, 7 Sep 2017 15:00:36 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ue1DU4fLD4-0aP0HPA9; Thu, 07 Sep 2017 15:00:36 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0ZdeV6Ic; Thu, 07 Sep 2017 15:00:35 +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: Thu, 7 Sep 2017 15:00:07 +0300 Message-Id: <1504785609-27545-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 12/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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 +- test/linux-generic/pktio_ipc/Makefile.am | 3 --- 6 files changed, 6 insertions(+), 17 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..ef9537b1 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,14 +24,6 @@ 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 - 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) diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am index eaa8bdd6..4287fbc0 100644 --- a/test/linux-generic/pktio_ipc/Makefile.am +++ b/test/linux-generic/pktio_ipc/Makefile.am @@ -4,9 +4,6 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation test_PROGRAMS = pktio_ipc1\ pktio_ipc2 -pktio_ipc1_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -pktio_ipc2_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - pktio_ipc1_SOURCES = pktio_ipc1.c ipc_common.c ipc_common.h pktio_ipc2_SOURCES = pktio_ipc2.c ipc_common.c ipc_common.h From patchwork Thu Sep 7 12:00:08 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: 111905 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp108059ybm; Thu, 7 Sep 2017 05:28:12 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6c5mCRod0kxIdFxAhW6zB+tpdBImNBrEMM6aQoh59KzPCrpVZl3tM5F5sQLw14CxUm8ctd X-Received: by 10.55.201.219 with SMTP id m88mr3112355qkl.303.1504787292898; Thu, 07 Sep 2017 05:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504787292; cv=none; d=google.com; s=arc-20160816; b=KitNbgorxiQ9nOKu5HhLzsMvF13EEQqkcaBTis1Tw9ZcUj4bsBhHQzik/w1DOvtjE/ bPePQTPMRfjaLfKRgCJulerTmoSzqCEcYQGm4dDvLIhsOODydVq5y+xJ/1qy/iLhDM7O WOl84G6XB+pa7rBu4qVoaMh8yi96Szk5/6cT9/lOcVZjzvXBqSGW7YUn83QohzR8GXYZ xy1GYmFyhWPc/IhnNsZV9mluuX9MElxErBIJxtXfDmd9RRl0Uhc+U9yAS2eEp8ovEfwz p74PW3BtvxdO8AO4iT4WqD6pnc7xlSGBM2fSJJsoGnSFJuZZUowSreB3lEIxPtF9UvFX LlMw== 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=SkjhCInALqpdsSGxXvIEuq6k3kmM5C9bA4AVQiXAnzs=; b=ZGFGzYQa2ll6rzPWw4ItOA6Nm/UcGFXR5F7udJDa+FPmcS9BFfwnprRgbhMvJrmiIV 9SEnS0Ni9OfaA4/LLS9s9zkROdwiE/MckEBzmzrmNw7od/gSCKCF84LB5N2j+LaA4lzN mw1/VpbExDpqIUP9e7HCCHaZVQAklg+7ECwe9KJarVmPRcpVR065ZA1y+cHXJZJunaLH qCwlcUTM3itG/F4dDeSNTKVMiGcTw79K8C7og3zJbabG/qFeNW1zVYS9Weo3yZ1zLroU 8sqmj8Ki7HWbAwLWwLUMBBIsubSVzk+jJZQb1FlQGFKXm5cNvSACIh/cdpD03w7Yq8gg xnvA== 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 l28si2928496qtf.82.2017.09.07.05.28.12; Thu, 07 Sep 2017 05:28:12 -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 8AE6F65BE4; Thu, 7 Sep 2017 12:28:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 5A4D76486A; Thu, 7 Sep 2017 12:08:44 +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 D407C644D6; Thu, 7 Sep 2017 12:08:31 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 0EEC764A61 for ; Thu, 7 Sep 2017 12:00:39 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 996177833CE for ; Thu, 7 Sep 2017 15:00:36 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9dsSeQv0DI-0ajS64UH; Thu, 07 Sep 2017 15:00:36 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0adGNQ6p; Thu, 07 Sep 2017 15:00:36 +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: Thu, 7 Sep 2017 15:00:08 +0300 Message-Id: <1504785609-27545-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 13/14] travis: don't error out if there are no patches to check 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a32ad5d..6fbae4f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -277,7 +277,7 @@ jobs: script: - echo ${TRAVIS_COMMIT_RANGE}; - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`; - - if [ -z "${ODP_PATCHES}" ]; then env; exit 1; fi; + - if [ -z "${ODP_PATCHES}" ]; then env; exit 0; fi; - ./scripts/ci-checkpatches.sh ${ODP_PATCHES}; after_failure: From patchwork Thu Sep 7 12:00:09 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: 111906 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp109554ybm; Thu, 7 Sep 2017 05:29:37 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5o871F4zS659vs0dKwvd1Chmqakb1Z9mSmIQCkxv1n4d6MiicYYX+Q4yzFHDtW2PBYnFbC X-Received: by 10.200.57.130 with SMTP id v2mr3440109qte.101.1504787377011; Thu, 07 Sep 2017 05:29:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504787377; cv=none; d=google.com; s=arc-20160816; b=bM6lVAwD/DUg3fTYSAk2MqCHWpLftv6bYPPCqYoSd4TAvMCTLVbZPNPwSmndbmc8Mu Fj+XmXcdTYNXZJ1YXycf2/VLKedubcp5SIZj/MycVxwiaTFcyKGo218zGoNHl4Z2ZEnB s8r6pCT6sho5S+QhkAcGjaTWJ4F18P+3cIU7TBVMvIg+we8NdmrER/SlDByTpzLc6TmW 0zGzX6GJB5Llwg31/6xOPX0UM1yoHjpBLEFOjJOwVYu641LagH1IoBed+OtqtCOrD+ZH geHmW9ZmJaOOuDPHbF5f0lDkojq88/mPTNwMuyXQwtzEk2oHRJCMYBzWI8g7Ki6D+N0W drkg== 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=4BoVScvL3OrwaHcIxCATe7E7vjdzDY7oxGdDok7bUxY=; b=Eozjrc04C0to0sxr0rJ1l7xdLAB80rmaF3qenDKehrko3tyyoNpzcluHvHY5aKfAKL hMnBU2L6Op4qT7xz6aFk6IsBKalxnLl6aghnJ0iv6dEams+R6afHVlu0fsvHnAYGkKUi mH31wUjj02dnP3O5b+8bL2CI/52J7/bihylg1k6j3c0/1AIIH7+/VWocBfQMOIl3cJww 4VeGDoznQVWfRYX5ayE2dDtuB6W+bWmlrm1cVPjB6fPoABQzRNo3+pKYaFEYtgGLQOfG edtUYdOrxl2ZLLaNz9hkz4Q/+Jg0vNuzUskCvR6u8fFxF7ZbhLC3mNZQKlnWBBEBWmfI TeBQ== 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 e12si2776715qkj.326.2017.09.07.05.29.36; Thu, 07 Sep 2017 05:29:36 -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 89C96646DE; Thu, 7 Sep 2017 12:29:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id ABCFE644A0; Thu, 7 Sep 2017 12:08:55 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 86599644D6; Thu, 7 Sep 2017 12:08:33 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id 0129964FD5 for ; Thu, 7 Sep 2017 12:00:40 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 6E862588257A for ; Thu, 7 Sep 2017 15:00:38 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id UXKwF0CCYl-0bumSGl5; Thu, 07 Sep 2017 15:00:37 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0ad4lWLU; Thu, 07 Sep 2017 15:00:36 +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: Thu, 7 Sep 2017 15:00:09 +0300 Message-Id: <1504785609-27545-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 14/14] travis: skip install stage for doxygen and checkpatch tests 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6fbae4f2..38586242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,7 +118,6 @@ install: - sudo apt-get install linux-headers-`uname -r` - sudo pip install coverage - gem install asciidoctor - - PATH=${PATH//:\.\/node_modules\/\.bin/} # DPDK pktio. Note that cache must be purged if dpdk version changes. - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"} @@ -265,6 +264,8 @@ jobs: - stage: test env: TEST=doxygen compiler: gcc + install: + - true script: # doxygen does not trap on warnings, check for them here. - ./bootstrap @@ -274,6 +275,8 @@ jobs: - stage: test env: TEST=checkpatch compiler: gcc + install: + - true script: - echo ${TRAVIS_COMMIT_RANGE}; - ODP_PATCHES=`echo ${TRAVIS_COMMIT_RANGE} | sed 's/\.//'`;