From patchwork Fri Oct 6 18: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: 115113 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2125635qgn; Fri, 6 Oct 2017 12:02:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCE143OXJU+BFzryhfnRMYWFg+vBsW0Pm4P1SBL+EDiIvc5S9B4+5c40Wu+rPQjCMOpv22K X-Received: by 10.36.76.150 with SMTP id a144mr3684306itb.39.1507316527752; Fri, 06 Oct 2017 12:02:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316527; cv=none; d=google.com; s=arc-20160816; b=WDJVftnk2K5Lp17WgYWyaDxLF+95uyjHoulEtcSegniyxOQVMgVpgCPPgWAD1Gne5D Wqm6r1H4EQ+Yk4HZwUo+jQahyikuPUdgrYYwg+KiWS2PAoZlCNvSma4qPxWnacpwRRJf dtVxz6bcdVJsd46Kq2ggfvMuc9ej1AJ4StQSG1S3e08iZkglg9VvN8jwrVj0tCqQwYzU o0StbFIRFHoY7CZxChxJKBQdGzX1qPwnEGWTHU7zAj3qwNY5V/ZdWCTh4BWgvqFfnCJn 4OXF9f/ozMSRy4ijV5rvYspRRbWKE4B5rU5mRwdqW5HiTeTQDuVusg5BmG4tO27mchaq Kr0Q== 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=BAB6JH5zjTvzTdClvO3LohqUYV9lfyr7/t6CKGIdN24=; b=Q7s9srBoiRDkZfKPnflYgoxaXkg11rYUQ5Pu65Lx8DczvVrxcjbAFkr+64JORuqggO zvJRcsKMzovuq2DDPobB60vR+BuXKF6Px81dk69xCuAMX0j07c4TzK6dL6N+/vaeHvNU kxOCLP5DBHANj8Y8J+noHtUxdBBfrja1nQDRwbOdod8DvddWCO7CheBZ0iUqG0z8+oBl C9U3MeZl5p8MtVmXz+1zzB4fBFCGevjTQqNEWESX9q6H9L4BCuaUni9HgahrSg89vEOq swCpYoaRBFwSyXYQMZcT8JWYNU4UMN3OnHzNZV7v0HJIZHLQ+KUqwNf43mBu0ysymUcB w+zw== 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 s15si1758699ith.166.2017.10.06.12.02.07; Fri, 06 Oct 2017 12:02:07 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4B015659D2; Fri, 6 Oct 2017 19:02:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1013D65BE4; Fri, 6 Oct 2017 19:01:27 +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 181EC65BDE; Fri, 6 Oct 2017 19:01:24 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 459CD60130 for ; Fri, 6 Oct 2017 19:00:28 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward105o.mail.yandex.net (Yandex) with ESMTP id D8AB74445622 for ; Fri, 6 Oct 2017 22:00:26 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7p2lSvWD1Q-0Qxa6Etk; Fri, 06 Oct 2017 22:00:26 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0QtGrOpD; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 21:59:56 +0300 Message-Id: <1507316415-2144-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 1/20] .gitignore: ignore only libtool m4 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1652a814f..3d4c58d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,8 @@ include/stamp-h1 lib/ libtool ltmain.sh -m4/*.m4 +m4/libtool.m4 +m4/lt*.m4 missing perf.data* pkgconfig/libodp*.pc From patchwork Fri Oct 6 18: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: 115114 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2126657qgn; Fri, 6 Oct 2017 12:02:51 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAG4Mhh4DBS2RY4sKBxgjL3k6uJ59olaYSvmBS6zhv2reWXxsqXiCIRBqFAW1GW8zPjQI9m X-Received: by 10.107.22.65 with SMTP id 62mr3821067iow.269.1507316570989; Fri, 06 Oct 2017 12:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316570; cv=none; d=google.com; s=arc-20160816; b=Oeb59+/thsidgY1y0TfCQ9ePc+YDu34WBOs7W/S43uzksYhTAodfPljYFVPiniDvGR KfpH8vnMzO+Uk2BeEvkRjGTJUdwWgV0g2wL8dZv32T+ARB7mQhq5K6nbGXjgDYoB6KaW 9HBnOwvWvHNHIVGbj1+cB2vp7pM0qvMj9pfxtL8r79v3dRR8hI3Sl9V5F3gkjGacyS9H 3Lo4szSFyfBCSb+xbym6uci0+dePkqvNNgfSEi4XWXCeU3KoxLTxfQtKDpS/uyN+NHkI 0dj+66B80QajtPeLpER9snEumfVVjkw4C27DhcEmFJNO7Wlq/TBIOwTa47GRRpS5A8St J+iA== 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=Ff5etRWqPl8r4dMC/tzacpJJQaOfpk+iNKgCqf4sZYU=; b=mK04sHUzkTsUGjodgIDV4y/Tgd4q96OLBvS3fC0gcPrsRwNl/0susEc6JZNHOrkGAF +0M5Ywc0DwD2sQTRGiYxubPkE1tG8UMt0XFyVYHksT5rHwBfjEM3ru77K8lv6/15THS6 pFPGnZzG9g4Uh7mkrctlVWuvgk2uWU60Bp2t7PMzFkjTCuTkIbM6XsIhSGL8yYHDAaDy Jqy5V+/uV3GqZVSANKxVv0KmWb5WtSIiX9FWsRlxWNQosOxMeovG03ivls3jxWAL/YX+ GIRmGRDraRzhMmfrOjZm5LfAtbcCQJ8VLg15GIjZfUToWodeQcgAmu2eVe0JMOJQYobk opVA== 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 z1si1709768itg.207.2017.10.06.12.02.50; Fri, 06 Oct 2017 12:02:50 -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 3C9DA65C01; Fri, 6 Oct 2017 19:02:50 +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 6E69165BE3; Fri, 6 Oct 2017 19:01: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 8DDD665BD3; Fri, 6 Oct 2017 19:01:25 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 3D45A644E1 for ; Fri, 6 Oct 2017 19:00:29 +0000 (UTC) Received: from mxback15j.mail.yandex.net (mxback15j.mail.yandex.net [IPv6:2a02:6b8:0:1619::91]) by forward100p.mail.yandex.net (Yandex) with ESMTP id E4A595103211 for ; Fri, 6 Oct 2017 22:00:27 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DvSUGJ5t9M-0RZCpTlu; Fri, 06 Oct 2017 22:00:27 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0QtGRRHD; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 21:59:57 +0300 Message-Id: <1507316415-2144-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 2/20] m4: move openssl check to common place 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ m4/odp_openssl.m4 | 60 ++++++++++++++++++++++++++++++++ platform/linux-generic/m4/configure.m4 | 2 +- platform/linux-generic/m4/odp_openssl.m4 | 37 -------------------- 3 files changed, 61 insertions(+), 38 deletions(-) create mode 100644 m4/odp_openssl.m4 delete mode 100644 platform/linux-generic/m4/odp_openssl.m4 diff --git a/m4/odp_openssl.m4 b/m4/odp_openssl.m4 new file mode 100644 index 000000000..72568a8ae --- /dev/null +++ b/m4/odp_openssl.m4 @@ -0,0 +1,60 @@ +# ODP_OPENSSL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ----------------------------------------------------- +AC_DEFUN([ODP_OPENSSL], +[dnl +AC_ARG_VAR([OPENSSL_CPPFLAGS], [C preprocessor flags for OpenSSL]) +AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL crypto library]) +AC_ARG_VAR([OPENSSL_STATIC_LIBS], [static linker flags for OpenSSL crypto library]) + +########################################################################## +# Set optional OpenSSL path +########################################################################## +AC_ARG_WITH([openssl-path], +[AC_HELP_STRING([--with-openssl-path=DIR], + [path to openssl libs and headers (use system path if not provided)])], +[OPENSSL_CPPFLAGS="-I$withval/include" +OPENSSL_LIBS="-L$withval/lib -lcrypto"], +[if test "x$ac_cv_env_OPENSSL_LIBS_set" != "xset" ; then + OPENSSL_LIBS="-lcrypto" +fi]) +if test "x$ac_cv_env_OPENSSL_STATIC_LIBS_set" != "xset" ; then + OPENSSL_STATIC_LIBS="$OPENSSL_LIBS -ldl" +fi + +########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_CPPFLAGS=$CPPFLAGS +OLD_LIBS=$LIBS +CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS" +LIBS="$OPENSSL_LIBS $LIBS" + +########################################################################## +# Check for OpenSSL availability +########################################################################## +odp_openssl_ok=yes +AC_CHECK_HEADERS([openssl/des.h openssl/rand.h openssl/hmac.h openssl/evp.h], [], + [odp_openssl_ok=no]) +AC_CACHE_CHECK([for EVP_EncryptInit in -lcrypto], [odp_cv_openssl_crypto], +[AC_LINK_IFELSE([AC_LANG_CALL([], [EVP_EncryptInit])], + [odp_cv_openssl_crypto=yes], + [odp_cv_openssl_crypto=no])]) +if test "x$odp_cv_openssl_crypto" != "xyes" ; then + odp_openssl_ok=no +fi + +if test "x$odp_openssl_ok" = "xyes" ; then + m4_default([$1], [:]) +else + OPENSSL_CPPFLAGS="" + OPENSSL_LIBS="" + OPENSSL_STATIC_LIBS="" + m4_default([$2], [AC_MSG_FAILURE([OpenSSL not found])]) +fi + +########################################################################## +# Restore old saved variables +########################################################################## +LIBS=$OLD_LIBS +CPPFLAGS=$OLD_CPPFLAGS +]) # ODP_OPENSSL diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 8e008de44..63540c7eb 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -76,7 +76,7 @@ AC_SUBST([ATOMIC_LIBS]) m4_include([platform/linux-generic/m4/odp_pthread.m4]) m4_include([platform/linux-generic/m4/odp_timer.m4]) -m4_include([platform/linux-generic/m4/odp_openssl.m4]) +ODP_OPENSSL m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) diff --git a/platform/linux-generic/m4/odp_openssl.m4 b/platform/linux-generic/m4/odp_openssl.m4 deleted file mode 100644 index 1d520077c..000000000 --- a/platform/linux-generic/m4/odp_openssl.m4 +++ /dev/null @@ -1,37 +0,0 @@ -########################################################################## -# Set optional OpenSSL path -########################################################################## -AC_ARG_WITH([openssl-path], -AC_HELP_STRING([--with-openssl-path=DIR path to openssl libs and headers], - [(or in the default path if not specified).]), - [OPENSSL_PATH=$withval - OPENSSL_CPPFLAGS="-I$OPENSSL_PATH/include" - OPENSSL_LIBS="-L$OPENSSL_PATH/lib" - ],[]) - -########################################################################## -# Save and set temporary compilation flags -########################################################################## -OLD_LDFLAGS=$LDFLAGS -OLD_CPPFLAGS=$CPPFLAGS -LIBS="$OPENSSL_LIBS $LIBS" -CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS" - -########################################################################## -# Check for OpenSSL availability -########################################################################## -AC_CHECK_LIB([crypto], [EVP_EncryptInit], [OPENSSL_LIBS="$OPENSSL_LIBS -lcrypto" - OPENSSL_STATIC_LIBS="$OPENSSL_LIBS -ldl"], - [AC_MSG_FAILURE([OpenSSL libraries required])]) -AC_CHECK_HEADERS([openssl/des.h openssl/rand.h openssl/hmac.h openssl/evp.h], [], - [AC_MSG_ERROR([OpenSSL headers required])]) - -AC_SUBST([OPENSSL_CPPFLAGS]) -AC_SUBST([OPENSSL_LIBS]) -AC_SUBST([OPENSSL_STATIC_LIBS]) - -########################################################################## -# Restore old saved variables -########################################################################## -LIBS=$OLD_LIBS -CPPFLAGS=$OLD_CPPFLAGS From patchwork Fri Oct 6 18:59:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115115 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2128924qgn; Fri, 6 Oct 2017 12:04:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBntvtf4LJ0hj8lqfgo5/T9tlnV+DImlLScEahTFvVbIWqv+9PT88bg+ou0DF7kiA8C0cvX X-Received: by 10.107.183.19 with SMTP id h19mr3927071iof.218.1507316680037; Fri, 06 Oct 2017 12:04:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316680; cv=none; d=google.com; s=arc-20160816; b=qgtvRdx1F8wgn6mNOjWU8RX4nvXqDEEOTOjKxwflVj9DGGCcb4s1fMCQQdmQXmK3Gp 1FUIF8BmS5rXNnnZ4Vwz/7ymzAaATlBQ0HboyalV2W0P9qs1M7FGSgyJ+3QJsanLoDqr 9YWrwwj0dM7Jf8DvYs/yGMquTfxat4TAcT0Z0hLoRqbtonbE6Wj+Cjkyq26cqEAmgEbN SMEhSmY6LB9TWOzwPpXsAkLPenpm1pISMTOXyGfJ9qfW9aDceZaQ3uxQ/PW0bNYdgUbo VqYMW3JDJbCzHPiRLnW+2cpwZNy+bhIUwElF1oLPCIFmVSi2qo4qn9AXEXInSGP4uBSf dSJA== 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=FkQ5vElamUGKuuKO2JG71sPwGkUn7MfJy9MPGI+1OD0=; b=N/rPV3VHM7CWeT99bjHSz7I8W1iRNX84PzJJGWdaKz441w8zHLBUdSHXO5hbVVrS0F KooJniSlQAPv3Y4J8ux1okNGLMvQtCyf82V6iaZh7zpoEUUPUwxTdX1yBO5kOwQi69Rd ZAqSJYZUIiv6dsVdn2hBKEH+cNpleKVJsCu9TeaYN0AdVR1gB7ka7139pDci88JRAuIj zG+zNAwZiRdPJoxgSq5KdBHFteuvg2ELw7FLWOJd/p2DLlmXzj7lzeUeL27qr/1IbacT LxhJwtQ/JLpxfE7sl/vLtLykI6XKcvmOxVW36QqGV+ECaCZt9gOEwjWDnXCmXv58L+Zo 0Ymw== 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 p2si1736133iti.97.2017.10.06.12.04.39; Fri, 06 Oct 2017 12:04: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 51E1C65C28; Fri, 6 Oct 2017 19:04:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0E69360749; Fri, 6 Oct 2017 19:01:41 +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 0216965BF2; Fri, 6 Oct 2017 19:01:37 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 06543659D2 for ; Fri, 6 Oct 2017 19:00:36 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward102j.mail.yandex.net (Yandex) with ESMTP id A49785604807 for ; Fri, 6 Oct 2017 22:00:34 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id iJt1RSLyP7-0SneTkxp; Fri, 06 Oct 2017 22:00:28 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0Rte6L8w; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 21:59:58 +0300 Message-Id: <1507316415-2144-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 3/20] m4: move timer_create check to common place 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ {platform/linux-generic/m4 => m4}/odp_timer.m4 | 7 +++++-- platform/linux-generic/m4/configure.m4 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename {platform/linux-generic/m4 => m4}/odp_timer.m4 (63%) diff --git a/platform/linux-generic/m4/odp_timer.m4 b/m4/odp_timer.m4 similarity index 63% rename from platform/linux-generic/m4/odp_timer.m4 rename to m4/odp_timer.m4 index 3122c92b4..9a552f9ff 100644 --- a/platform/linux-generic/m4/odp_timer.m4 +++ b/m4/odp_timer.m4 @@ -1,8 +1,11 @@ +# ODP_TIMER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ########################################################################## # Check for POSIX timer functions ########################################################################## - +AC_DEFUN([ODP_TIMER], [dnl AC_CHECK_LIB([rt], [timer_create], [TIMER_LIBS="-lrt"], [AC_CHECK_LIB([posix4], [timer_create], [TIMER_LIBS="-lposix4"], - [AC_MSG_FAILURE([timer_create not found])])]) + [m4_default([$2], [AC_MSG_FAILURE([timer_create not found])])])]) +m4_default([$1], [:]) AC_SUBST([TIMER_LIBS]) +]) # ODP_TIMER diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 63540c7eb..4d6ef49b9 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -75,7 +75,7 @@ fi AC_SUBST([ATOMIC_LIBS]) m4_include([platform/linux-generic/m4/odp_pthread.m4]) -m4_include([platform/linux-generic/m4/odp_timer.m4]) +ODP_TIMER ODP_OPENSSL m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) From patchwork Fri Oct 6 18:59:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115116 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2129688qgn; Fri, 6 Oct 2017 12:05:19 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB5cr+kJ0tf/UUdz+WMf1j4ufBd+gRSKtKzPSxMWhe6d02Qux6p+lO3H6Vkx3MIDH4vkMgP X-Received: by 10.107.143.201 with SMTP id r192mr3536258iod.36.1507316719801; Fri, 06 Oct 2017 12:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316719; cv=none; d=google.com; s=arc-20160816; b=CFiQ64dOwx7FHXus2FbtM5wJ6OV8VpB3+1A+DRcABkPMdHZe3cngDpQoJCcNF4fkDe fGhjjocCt1HU30tuS8IgIdfsbX6UWAwH8SGWxsMdHzE7SMTRNmqzIYdN/wrZ/Bf1Iop3 b5T8WWrU818/Bg1IzUwvhvrBkAKrFmb6BD0Y5P0IXFv1nCM6xIfqCsqrdRYlECG3yPjm XywiJsitcq0rqKH5eXCVa8Q2sB7pkpGtH/HHUqvQAUtpr0BtByCoSGhmYuqikvUP/8Gg /awiS7QFoAJL6nwTYSJnszV4NMiiUmEABNNlgL2Y7XjB8W8nJxY1xqZzAtdPGmFpfmoL NCVQ== 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=SHqghpKKexJkeJjQxYhGMKzltluCq0UvZWjfQsatOCU=; b=0/GZ4WE/+uPZavWwBwO35/fAwpI0M7NOM5LbNrLVw6OvEH1+08PsuBHT3wpIIadXkL CZ6RhCMSpjAih6/B2BYy1CKfcVH9x93TxQXomy5yf7XLRGUrLSEYuv+GoHMuqdNz/+YN dKiqNdMYrKAzyD2xQmCHwsZn8STg2JQ7SWwqxeNPfa82u0VyY7fNvT4Ucahxp+xnJiFh SPOU2ysm1+rkmMWsYvvU2gHEM31y4Rl8SKUOlYLVnFpxqhJNL1w8t5R3AhPlBQ41Wxtj q+UhctsHiVn7WxmH4HL93XEIVL8axjMylc2s+J5e5ckbbENxHQt1NQnnrL+nHZyZOA09 rg7g== 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 c16si1492460iob.93.2017.10.06.12.05.19; Fri, 06 Oct 2017 12:05:19 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1787565BFE; Fri, 6 Oct 2017 19:05:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 383266088C; Fri, 6 Oct 2017 19:01:47 +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 2C52565BE9; Fri, 6 Oct 2017 19:01:40 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 9C40C65BBA for ; Fri, 6 Oct 2017 19:00:36 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 300BC40830CB for ; Fri, 6 Oct 2017 22:00:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1inOx9IIUe-0Zv4CuVr; Fri, 06 Oct 2017 22:00:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0YtGCmB5; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 21:59:59 +0300 Message-Id: <1507316415-2144-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 4/20] m4: move -fvisibility=hidden check to separate file 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ m4/odp_visibility.m4 | 21 +++++++++++++++++++++ platform/linux-generic/m4/configure.m4 | 12 +----------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 m4/odp_visibility.m4 diff --git a/m4/odp_visibility.m4 b/m4/odp_visibility.m4 new file mode 100644 index 000000000..955971f3c --- /dev/null +++ b/m4/odp_visibility.m4 @@ -0,0 +1,21 @@ +# ODP_VISIBILITY +# -------------- +# Enable -fvisibility=hidden if using a gcc that supports it + +AC_DEFUN([ODP_VISIBILITY], [dnl +VISIBILITY_CFLAGS="-fvisibility=hidden" +AC_CACHE_CHECK([whether $CC supports -fvisibility=hidden], + [odp_cv_visibility_hidden], [dnl +OLD_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" +AC_LINK_IFELSE([AC_LANG_PROGRAM()], [odp_cv_visibility_hidden=yes], + [odp_cv_visibility_hidden=no]) +CFLAGS=$OLD_CFLAGS +]) + +if test "x$odp_cv_visibility_hidden" != "xyes" ; then + VISIBILITY_CFLAGS="" +fi + +AC_SUBST(VISIBILITY_CFLAGS) +]) # ODP_VISIBILITY diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 4d6ef49b9..4e3ce6344 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,14 +1,4 @@ -# Enable -fvisibility=hidden if using a gcc that supports it -OLD_CFLAGS="$CFLAGS" -AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) -VISIBILITY_CFLAGS="-fvisibility=hidden" -CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" -AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]), - [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]); - -AC_SUBST(VISIBILITY_CFLAGS) -# Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed. -CFLAGS=$OLD_CFLAGS +ODP_VISIBILITY AC_MSG_CHECKING(for GCC atomic builtins) AC_LINK_IFELSE( From patchwork Fri Oct 6 19:00:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115119 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2132448qgn; Fri, 6 Oct 2017 12:07:50 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCtxDRQ48pJB5TfXSAf0zlXdS8LzFgvLwdHZvdBnjVkulsLLwcnKAoYJv6eEOJYnpjjn1v/ X-Received: by 10.107.8.30 with SMTP id 30mr3648275ioi.83.1507316870150; Fri, 06 Oct 2017 12:07:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316870; cv=none; d=google.com; s=arc-20160816; b=iUz8hgI/eSMUPcdc3HeEVsHJhKRopAJfxfEKWPzftyN3/qZV6XwYG72F7IgLpHdT0A prF8vzPz1b1+Zl2KmdeFpW5qSJHuZ3B4eOYiVM+86uFt9uGIRgOxyXGn6rm5xTuth9OD r0h+Frh7u4NN8f4mfre9/OdF9s/HGAhx/g33nHwKGuB3WDJBC2BYXJr1K4mKkUeU+rSW S0ABzYC1V0cbfR9EQraPOMUQZOkrMfsLZRVvhgtJ+S0j2NZxkJSo6qHZA624GkKXIsog 8UcLQ7ySyxseuqLtuVCBYD1S9A+CsJgETHlQnfrGfyyombrodLBiSaRPuUH+1AzEh17m YoNQ== 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=WBVZslf0o43dTdKBeT/jvcIpOYyUvZ4JyKfxDrFQan0=; b=A4DqO6Z1oGLpZCPL7QQBmM29GCEe5Nqb6lGBqOxYVaebOG0KXV/d9yh8F8GUY+1JK3 XqwkacGYgAjGM6PVAISTQCVSGVbZrTTs3QqNFlVIoSRJXjMI/TAo5R6UJ3uOtCRWpEOd 3biP3+kh7ghEShtNE6FTgGI1fZXshDh19E4xa1tvhxYgDSbUwchVbmIHryLJCD2vwSd4 F2gRO4V008OmSnQl4SL8asGQDnJ/1aQCa4BdXu5IVfx6O4FboAxiYkFPZ235r+o5tDls wqIJVP5avojQNUMOFLgZpWJkqm2h56aBvvfQsoRzxtOjxBk4/k9bAujVH4e7wxzsy75J 3GUg== 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 j95si1591566iod.232.2017.10.06.12.07.49; Fri, 06 Oct 2017 12:07:50 -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 A451860A38; Fri, 6 Oct 2017 19:07:49 +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 A1D2065BE4; Fri, 6 Oct 2017 19:02:12 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 70127608E4; Fri, 6 Oct 2017 19:02:05 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 71C5C65BCA for ; Fri, 6 Oct 2017 19:00:37 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward101j.mail.yandex.net (Yandex) with ESMTP id C9E0D1243B66 for ; Fri, 6 Oct 2017 22:00:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id M1IQTcK7k2-0Zkqbm8E; Fri, 06 Oct 2017 22:00:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0ZtShndi; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 22:00:00 +0300 Message-Id: <1507316415-2144-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 5/20] m4: move atomic checks to separate file 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 While we are at it, run 128bit atomic check only if __int128 is available for the target platform. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ m4/odp_atomic.m4 | 95 ++++++++++++++++++++++++++++++++++ platform/linux-generic/m4/configure.m4 | 65 +---------------------- 2 files changed, 96 insertions(+), 64 deletions(-) create mode 100644 m4/odp_atomic.m4 diff --git a/m4/odp_atomic.m4 b/m4/odp_atomic.m4 new file mode 100644 index 000000000..413dcbda9 --- /dev/null +++ b/m4/odp_atomic.m4 @@ -0,0 +1,95 @@ +# ODP_ATOMIC +# ---------- +# Run different atomic-related checks +AC_DEFUN([ODP_ATOMIC], [dnl +ODP_ATOMIC_BUILTINS + +dnl Check whether -latomic is needed +use_libatomic=no + +ODP_ATOMIC_NEEDED_64BIT([use_libatomic=yes]) +AC_CHECK_TYPE([__int128], [ODP_ATOMIC_NEEDED_128BIT([use_libatomic=yes])]) + +if test "x$use_libatomic" = "xyes"; then + ATOMIC_LIBS="-latomic" +fi +AC_SUBST([ATOMIC_LIBS]) +]) # ODP_ATOMIC + +# ODP_ATOMIC_BUILTINS +# ------------------- +# +AC_DEFUN([ODP_ATOMIC_BUILTINS], [dnl +AC_CACHE_CHECK([for GCC atomic builtins], [odp_cv_atomic_builtins], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [[int main() { + int v = 1; + __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); + __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); + __atomic_store_n(&v, 1, __ATOMIC_RELAXED); + __atomic_load_n(&v, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_builtins=yes], + [odp_cv_atomic_builtins=no])]) + +if test "x$odp_cv_atomic_builtins" != "xyes" ; then + AC_MSG_FAILURE([GCC-style __atomic builtins not supported by the compiler, use gcc > 4.7.0]) +fi +]) # ODP_ATOMIC_BUILTINS + +# ODP_ATOMIC_NEEDED_64BIT([ACTION_IF_NEEDED]) +# ------------------------------------------- +# +AC_DEFUN([ODP_ATOMIC_NEEDED_64BIT], [dnl +AC_CACHE_CHECK([whether -latomic is needed for 64-bit atomic built-ins], + [odp_cv_atomic_needed_64bit], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + #include + static uint64_t loc; + int main(void) + { + uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_needed_64bit=no], + [odp_cv_atomic_needed_64bit=yes])]) + +if test "x$odp_cv_atomic_needed_64bit" = "xyes" ; then + AC_CHECK_LIB( + [atomic], [__atomic_exchange_8], + [m4_default([$1], [:])], + [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) +fi +]) # ODP_ATOMIC_NEEDED_64BIT + +# ODP_ATOMIC_NEEDED_128BIT([ACTION_IF_NEEDED]) +# ------------------------------------------- +# +AC_DEFUN([ODP_ATOMIC_NEEDED_128BIT], [dnl +AC_CACHE_CHECK([whether -latomic is needed for 128-bit atomic built-ins], + [odp_cv_atomic_needed_128bit], [dnl +AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + #include + static __int128 loc; + int main(void) + { + __int128 prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); + return 0; + } + ]])], + [odp_cv_atomic_needed_128bit=no], + [odp_cv_atomic_needed_128bit=yes])]) + +if test "x$odp_cv_atomic_needed_128bit" = "xyes" ; then + AC_CHECK_LIB( + [atomic], [__atomic_exchange_16], + [m4_default([$1], [:])], + [AC_MSG_FAILURE([__atomic_exchange_16 is not available])]) +fi +]) # ODP_ATOMIC_NEEDED_128BIT diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 4e3ce6344..397c539b8 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -1,68 +1,5 @@ ODP_VISIBILITY - -AC_MSG_CHECKING(for GCC atomic builtins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [[int main() { - int v = 1; - __atomic_fetch_add(&v, 1, __ATOMIC_RELAXED); - __atomic_fetch_sub(&v, 1, __ATOMIC_RELAXED); - __atomic_store_n(&v, 1, __ATOMIC_RELAXED); - __atomic_load_n(&v, __ATOMIC_RELAXED); - return 0; - } - ]])], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - echo "GCC-style __atomic builtins not supported by the compiler." - echo "Use newer version. For gcc > 4.7.0" - exit -1) - -dnl Check whether -latomic is needed -use_libatomic=no - -AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic built-ins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - #include - static uint64_t loc; - int main(void) - { - uint64_t prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_8], - [use_libatomic=yes], - [AC_MSG_FAILURE([__atomic_exchange_8 is not available])]) - ]) - -AC_MSG_CHECKING(whether -latomic is needed for 128-bit atomic built-ins) -AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - static __int128 loc; - int main(void) - { - __int128 prev; - prev = __atomic_exchange_n(&loc, 7, __ATOMIC_RELAXED); - return 0; - } - ]])], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB( - [atomic], [__atomic_exchange_16], - [use_libatomic=yes], - [AC_MSG_CHECKING([cannot detect support for 128-bit atomics])]) - ]) - -if test "x$use_libatomic" = "xyes"; then - ATOMIC_LIBS="-latomic" -fi -AC_SUBST([ATOMIC_LIBS]) +ODP_ATOMIC m4_include([platform/linux-generic/m4/odp_pthread.m4]) ODP_TIMER From patchwork Fri Oct 6 19:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115117 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2131507qgn; Fri, 6 Oct 2017 12:06:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA5M01SbYccgnpZG+9vDt5sph5Xx+RWdiO4cYUkMOTVM+KRxfHqVY9Gzkx0uPKUkqLvvuuC X-Received: by 10.200.40.117 with SMTP id 50mr4528091qtr.167.1507316818120; Fri, 06 Oct 2017 12:06:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316818; cv=none; d=google.com; s=arc-20160816; b=EuX5L+1CYEHVVg+dslKsP4eXeSYgdYraCfo6kJU67VuTE6t7Doe0sZ7r7eKMCO6+ku S3VQezW+oMtuh+zl37cXvxw4uQgSAXw+EAnnxzn37mDWrIUeFDSDJBR0y0tyi9ECg0Fr Sdm9POkuHyRT04aSXtvC42k7ZG/zn+LZWTkrdeIc80WuWwJxeWadXh6E8u2S5HlHXAaB QIFgEvkE1b7prqh8vvd1DSjaR/kzpe32opFTTawqiVXUiL/xMxKfb7WCNgxRuVQ+9+34 HLmb5FaFATuDXRQQs4kY2Bi1brqRqHdZumzkXwO4WFV41JL9GXCC6k/Yfvw2Nd+zBk8U fVBg== 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=AauB6/SUUBEBfifC6OesxBQCSY4EwjvBlmc898/SInM=; b=UpZ7A9rtrM7cELiYjcY1/yFL5LCS9X5dvZiXcCHW4NrHP/OCWhUQQxonIJBZgnRDSS wYDGYK84P96Pd4Hcki5iuPnAFSjM2FpXZG5L7nJ3Au+4Cp8W9A/O4+m1VZDNYnrXRb8j H+Ww8KuYSeDClPMOhqLF007xkYjrgjxL76EZPQOBpdI8Ms4/sohfpTl2+AudIj5yGHkU PQZ5FWd0RPlepHv3K3Uo77p35oABSFy+ejDw0n5mkOyeTXUUaq1OI9SOJHILHi6WYEJp OZPQcvhFleVMNbtjMhRfck7SIWxG9z9iw82MoCbSbOgqCa0LvV7ud+iX1g8nqCbQ/Dv5 qGcg== 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 y25si379019qtb.300.2017.10.06.12.06.57; Fri, 06 Oct 2017 12:06:58 -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 C684360765; Fri, 6 Oct 2017 19:06:57 +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 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 57952608E4; Fri, 6 Oct 2017 19:02:09 +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 4624260845; Fri, 6 Oct 2017 19:02:05 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 64E8C65BC9 for ; Fri, 6 Oct 2017 19:00:37 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 63CD3510320B for ; Fri, 6 Oct 2017 22:00:36 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xA0XKIZkjm-0axaFTSh; Fri, 06 Oct 2017 22:00:36 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0ZtS5XBx; Fri, 06 Oct 2017 22: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: Fri, 6 Oct 2017 22:00:01 +0300 Message-Id: <1507316415-2144-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 6/20] example: switch odp_l3fwd from test_debug.h to example_debug.h 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ example/l3fwd/Makefile.am | 2 +- example/l3fwd/odp_l3fwd.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index 422a3bf3a..21d0cf1a3 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_l3fwd$(EXEEXT) odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static -odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -I${top_srcdir}/test +odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index f579d36d3..e6d8b2883 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -313,7 +313,7 @@ static int run_worker(void *arg) } if (num_pktio == 0) - LOG_ABORT("No pktio devices found\n"); + EXAMPLE_ABORT("No pktio devices found\n"); if_idx = input_ifs[pktio]; inq = input_queues[pktio]; @@ -740,26 +740,26 @@ static void setup_worker_qconf(app_args_t *args) q = &args->qconf_config[i]; if (q->core_idx >= nb_worker || q->if_idx >= if_count) - LOG_ABORT("Error queue (%d, %d, %d), max port: " + EXAMPLE_ABORT("Error queue (%d, %d, %d), max port: " "%d, max core: %d\n", q->if_idx, q->rxq_idx, q->core_idx, args->if_count - 1, args->worker_count - 1); /* check if one queue is configured twice or more */ if (queue_mask[q->if_idx][q->rxq_idx]) - LOG_ABORT("Error queue (%d, %d, %d), reconfig queue\n", + EXAMPLE_ABORT("Error queue (%d, %d, %d), reconfig queue\n", q->if_idx, q->rxq_idx, q->core_idx); queue_mask[q->if_idx][q->rxq_idx] = 1; port = &global.l3fwd_pktios[q->if_idx]; if (port->rxq_idx < q->rxq_idx) - LOG_ABORT("Error queue (%d, %d, %d), queue should be" + EXAMPLE_ABORT("Error queue (%d, %d, %d), queue should be" " in sequence and start from 0, queue %d\n", q->if_idx, q->rxq_idx, q->core_idx, q->rxq_idx); if (q->rxq_idx > port->nb_rxq) { - LOG_ABORT("Error queue (%d, %d, %d), max queue %d\n", + EXAMPLE_ABORT("Error queue (%d, %d, %d), max queue %d\n", q->if_idx, q->rxq_idx, q->core_idx, port->nb_rxq - 1); } @@ -822,7 +822,7 @@ static void setup_worker_qconf(app_args_t *args) } if (odp_pktin_queue_config(port->pktio, &in_queue_param)) - LOG_ABORT("Fail to config input queue for port %s\n", + EXAMPLE_ABORT("Fail to config input queue for port %s\n", name); out_queue_param.num_queues = port->txq_idx; @@ -831,19 +831,19 @@ static void setup_worker_qconf(app_args_t *args) out_queue_param.op_mode = ODP_PKTIO_OP_MT; } if (odp_pktout_queue_config(port->pktio, &out_queue_param)) - LOG_ABORT("Fail to config output queue for port %s\n", + EXAMPLE_ABORT("Fail to config output queue for port %s\n", name); inq = port->ifin; nb_rxq = in_queue_param.num_queues; if (odp_pktin_queue(port->pktio, inq, nb_rxq) != nb_rxq) - LOG_ABORT("Fail to set pktin queue for port %s\n", + EXAMPLE_ABORT("Fail to set pktin queue for port %s\n", name); outq = port->ifout; nb_txq = out_queue_param.num_queues; if (odp_pktout_queue(port->pktio, outq, nb_txq) != nb_txq) - LOG_ABORT("Fail to set pktout queue for port %s\n", + EXAMPLE_ABORT("Fail to set pktout queue for port %s\n", name); } } From patchwork Fri Oct 6 19:00:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115120 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1705499edb; Fri, 6 Oct 2017 12:09:17 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC+FE09bgg8frVnzTFG1Pfh8yClmSdxi25zFA/Bn0NS+mPT36M1VXcuRTZUn80AXakXOnJ2 X-Received: by 10.36.203.129 with SMTP id u123mr3870862itg.107.1507316957781; Fri, 06 Oct 2017 12:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507316957; cv=none; d=google.com; s=arc-20160816; b=YmekWojVEvm36zBMeb5OwbH1sWBfUQC/ZB0pzjlCeUIvgd1PKF/Yp7ZGbiV48pr0rL r9/UNsa99ycerHu0qA4PnSwyQb6RAFR4+GqN87GdFxkyltKp2bK9tu+oA9em3NrLB8ck W+NRkOJ4mgrKf9ZMcaXiIAcHsiSc8O8On/e+J6Fx+rNsi4mBb8k2ZYDVPIcVeaCaujh8 FuDDX36wF3H+btqa38YX2134Y4rMtpKFQ8Vzib6GkYKEVbdiMYD+WqiuVhfGyn8c1PBN ii+h/JUDP6/o+GY6YlT+GRZm674p9uDERZdjU2tZE7QetGaOzCUOReXod8YvfrjywZUH RaEg== 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=vcIbflMsQLUzyPz7y57/5kmxK9eXQm85Kb185d9VDlE=; b=qgWNSVqBYrVkp0rtufcriVVSuXWY4hzAZKRL9+oqHgygB1SlHPEBbmgP3OsLq17hE0 6zF14g6SwcnKKEr8j3lGMdjRSbV+VFns70uYyWa9QFTEIalyZQmI6715oIC7sOvUm45l CNojcjxjbIckkW1ROFA5QdTfeIrWpXfoJojPG/QRlFaNWBxzmull/E6skrrEPVWahwqn VG+mhz7UW3WrP7ds++OmkEi2qKTBUi8EDai0uG+s7ZHPGod9hK3ATWz8zSy1Pn/jVi1+ sFIT2YGtXlBHeB7wGlfIpk3RaJgYJOPKmSYnU7etlvNUvtmOU2mqsBSInIvyxLHzK9WW lffA== 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 c77si242360ioj.351.2017.10.06.12.09.17; Fri, 06 Oct 2017 12:09:17 -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 2F89C6587F; Fri, 6 Oct 2017 19:09:17 +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 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 27FCB65BFD; Fri, 6 Oct 2017 19:02: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 E433265BBA; Fri, 6 Oct 2017 19:02:08 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 9D0D765BBB for ; Fri, 6 Oct 2017 19:00:38 +0000 (UTC) Received: from mxback15j.mail.yandex.net (mxback15j.mail.yandex.net [IPv6:2a02:6b8:0:1619::91]) by forward100p.mail.yandex.net (Yandex) with ESMTP id A203B510322F for ; Fri, 6 Oct 2017 22:00:37 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JUoJxfLlpb-0bZ4S8oc; Fri, 06 Oct 2017 22:00:37 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0btSQ5Sw; Fri, 06 Oct 2017 22:00:37 +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: Fri, 6 Oct 2017 22:00:03 +0300 Message-Id: <1507316415-2144-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 8/20] test: move run-test script to test_common dir 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ test/linux-generic/Makefile.am | 4 ++-- test_common/Makefile.am | 2 ++ test/linux-generic/run-test => test_common/run-test.sh | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename test/linux-generic/run-test => test_common/run-test.sh (100%) diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index f92083d73..b24449884 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -64,7 +64,7 @@ endif TEST_EXTENSIONS = .sh -dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER) +dist_check_SCRIPTS = tests-validation.env $(LOG_COMPILER) test_SCRIPTS = $(dist_check_SCRIPTS) @@ -75,6 +75,6 @@ tests-validation.env: if test_installdir installcheck-local: - $(DESTDIR)/$(testdir)/run-test + $(DESTDIR)/$(testdir)/run-test.sh endif diff --git a/test_common/Makefile.am b/test_common/Makefile.am index dee3404cd..4d6413eda 100644 --- a/test_common/Makefile.am +++ b/test_common/Makefile.am @@ -13,3 +13,5 @@ libthrmask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK endif + +dist_test_SCRIPTS = run-test.sh diff --git a/test/linux-generic/run-test b/test_common/run-test.sh similarity index 100% rename from test/linux-generic/run-test rename to test_common/run-test.sh From patchwork Fri Oct 6 19:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115122 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1707118edb; Fri, 6 Oct 2017 12:10:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD1nMGZrfLw0NbCk+tElEluYGwnUHAbucULjgWHslMX4WRDuemFiLWASc1gc7huXEy+taw5 X-Received: by 10.55.103.14 with SMTP id b14mr36711652qkc.267.1507317059611; Fri, 06 Oct 2017 12:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317059; cv=none; d=google.com; s=arc-20160816; b=StvtiPSmfJHz5asLWksfkL3RN5u6wcnkgxkfeOQYs1cMraqOX7fQwv8NuocJcBgWw7 /fxR84yP1tZkMIIiThNjMw3spXfeEXMqJfyriAW6m3JacGOzVE2AJSXGYwS7jgAZqZRH eEbrgwq9GQOPwhAaTfOZ+bOVoAZKUeYMF5bFKeioFYxptMJi4e2KcFOUljcMBwcPoDpM lu24DYQVxq5beqJlZCmtDWRuHaKkGSU/WqIwh1ZCMhvwEBFHRqlRUuOonefhgT0/bnLT DkfUFaME+/+OmWVrezvjRiNig3LFw1HT6R/nSic1ODldcYFkjeGmmKB36M040KWJkUH/ RTig== 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=OoR+ZDarWu61C2MG7NEgo0KayPh/q3vz3tcokFfHOMc=; b=afrQ008cDUIpctVdBxTxjeBPvtapH+ukgNWzD0fnk50U/U49J90cJsyUWk+AcZo/oA jvW2K2oq8GyNgvfcf99J+ChfsRyMYF6jqo/Em26nbHq7OCfB0fUiN4sdlyrjB8S/jIJQ 6/aK4OWY6H+VaRehX6R78/6ymgSNEHHCUUb1hC1YQV/bdJZgNDCBPhblNvFIpWgY02UR 84dJut9afCgRr0v4z3HNMBsfcNTv5BIGbzvDO3fwoQQsN5YlVLtwr5ySPw2XEUlZV86H CvyuYxOhMt5muvduwC21PpVkUSnF8dnURP1vGd675eBlCW91R2wmGW1HLioe88J+hwFn IKxQ== 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 o126si824905qke.530.2017.10.06.12.10.59; Fri, 06 Oct 2017 12:10:59 -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 238BC65BCC; Fri, 6 Oct 2017 19:10:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0CFDC65BEC; Fri, 6 Oct 2017 19:02:50 +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 1982F65BE1; Fri, 6 Oct 2017 19:02:37 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 93BF165897 for ; Fri, 6 Oct 2017 19:00:42 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 3D4F52D82DF4 for ; Fri, 6 Oct 2017 22:00:39 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3zimpSgG1U-0d5WlUDj; Fri, 06 Oct 2017 22:00:39 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0btGLdlg; Fri, 06 Oct 2017 22:00:37 +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: Fri, 6 Oct 2017 22:00:04 +0300 Message-Id: <1507316415-2144-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 9/20] test: move common validation tests handling to theirs own Makefile.am 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 calling common_plat validation tests from linux-generic tests subdir. Instead move their handling to proper Makefile.am. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ test/common_plat/validation/api/Makefile.am | 47 +++++++++++++++++++++++++++++ test/linux-generic/Makefile.am | 39 +++++------------------- 2 files changed, 55 insertions(+), 31 deletions(-) diff --git a/test/common_plat/validation/api/Makefile.am b/test/common_plat/validation/api/Makefile.am index 601bae6d2..e891c94cb 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -23,3 +23,50 @@ ODP_MODULES = atomic \ system SUBDIRS = $(ODP_MODULES) + +include $(top_srcdir)/test/Makefile.inc +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation + +TESTS = \ + atomic/atomic_main$(EXEEXT) \ + barrier/barrier_main$(EXEEXT) \ + buffer/buffer_main$(EXEEXT) \ + classification/classification_main$(EXEEXT) \ + cpumask/cpumask_main$(EXEEXT) \ + crypto/crypto_main$(EXEEXT) \ + errno/errno_main$(EXEEXT) \ + hash/hash_main$(EXEEXT) \ + init/init_main_ok$(EXEEXT) \ + init/init_main_abort$(EXEEXT) \ + init/init_main_log$(EXEEXT) \ + lock/lock_main$(EXEEXT) \ + packet/packet_main$(EXEEXT) \ + pool/pool_main$(EXEEXT) \ + queue/queue_main$(EXEEXT) \ + random/random_main$(EXEEXT) \ + scheduler/scheduler_main$(EXEEXT) \ + std_clib/std_clib_main$(EXEEXT) \ + thread/thread_main$(EXEEXT) \ + time/time.sh \ + timer/timer_main$(EXEEXT) \ + traffic_mngr/traffic_mngr.sh \ + shmem/shmem_main$(EXEEXT) \ + system/system_main$(EXEEXT) + +TESTNAME = validation + +TESTENV = tests-$(TESTNAME).env + +test_DATA = $(TESTENV) + +DISTCLEANFILES = $(TESTENV) +.PHONY: $(TESTENV) +$(TESTENV): + echo "TESTS=\"$(TESTS)\"" > $@ + echo "$(TESTS_ENVIRONMENT)" >> $@ + echo "$(LOG_COMPILER)" >> $@ + +if test_installdir +installcheck-local: + $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) +endif diff --git a/test/linux-generic/Makefile.am b/test/linux-generic/Makefile.am index b24449884..c65a26fd7 100644 --- a/test/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -1,38 +1,12 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation -ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api - SUBDIRS = performance if test_vald TESTS = validation/api/pktio/pktio_run.sh \ validation/api/pktio/pktio_run_tap.sh \ validation/api/shmem/shmem_linux \ - $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/errno/errno_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/hash/hash_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/queue/queue_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/random/random_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/scheduler/scheduler_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/std_clib/std_clib_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/time/time.sh \ - $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr.sh \ - $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ ring/ring_main$(EXEEXT) SUBDIRS += validation/api/pktio\ @@ -64,17 +38,20 @@ endif TEST_EXTENSIONS = .sh -dist_check_SCRIPTS = tests-validation.env $(LOG_COMPILER) +TESTNAME = linux-generic + +TESTENV = tests-$(TESTNAME).env -test_SCRIPTS = $(dist_check_SCRIPTS) +test_DATA = $(TESTENV) -tests-validation.env: +DISTCLEANFILES = $(TESTENV) +.PHONY: $(TESTENV) +$(TESTENV): echo "TESTS=\"$(TESTS)\"" > $@ echo "$(TESTS_ENVIRONMENT)" >> $@ echo "$(LOG_COMPILER)" >> $@ if test_installdir installcheck-local: - $(DESTDIR)/$(testdir)/run-test.sh + $(DESTDIR)/$(testdir)/run-test.sh $(TESTNAME) endif - From patchwork Fri Oct 6 19:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115123 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1708562edb; Fri, 6 Oct 2017 12:12:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDPMYCPdGuOcT9REB4cSR7jy+DWSVk4mWncjdKwb7kySF/40ah22PapjOc1pcJqwmsmpfwB X-Received: by 10.107.222.6 with SMTP id v6mr3749658iog.46.1507317143916; Fri, 06 Oct 2017 12:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317143; cv=none; d=google.com; s=arc-20160816; b=IvlJQEahdsi4QwJ/GmoXrs7Rn5UeTzmEPEmRw53BqsNWP/SMSm3iNUgL74pY8CgByo r+QmQpuEsk+wPKld4IcbZkIFBDdOy14G37wih/O+uO9lxCOwl+aricOizz4g3xTcFYmP ubwP0v6AHtAmVgySDvVbfuEnd+iCrV6ZveD6qsxBeZ09MIPZ/U5mje9F27GHIBn8n/nq pNxsD87BawbdS/Ijy7X7ksjY0eFGLpg4/8vQEITjWzyd56r02S5s7a0UG+Gs0vo3+kBC XxnIyhaZBq7VU+23Zow53hCTJBeKP8ioeS50dX3GMyt5yzhUIed/BigrbT8SP6sviv33 B83Q== 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=iw3c7uPPAt2fMVuelYqIM5daEJ98uwizHv6FxsHVrzc=; b=XD6FYuaD2cAEw1ZNu/gl7MP9wyKwQ4SvHC89QQ9tzdafRWCVxfmoDU0rCeEelaAnml qViDwbj7FKU6HKqtYDzoHAucz9vPtkKw3NXDBYVireoCKIujklODsxVh54ez2kGR5KhK FCP+cEgnh7f3m1DWYVIULXK5p3pDKq8+E3JDh9tkLvO7wD4pMrXhO6pWt8efWn5E0A1y kw2wUPTSEOu4PEEk8+Njd+e//Syy3C5CUd27zV/6UZQp/uf0Iq9cJrOVU/QUeqB4uMHL AtFDm9TNQAO7QbCla1BO3Ij9RAB6vqWEQUyKi9Mg7Kuxu7S/O7OCAK6IZ5rfPcjavHk1 mwSw== 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 d20si1588167iod.158.2017.10.06.12.12.22; Fri, 06 Oct 2017 12:12: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 EE370608A8; Fri, 6 Oct 2017 19:12: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 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 61A5165BE3; Fri, 6 Oct 2017 19:03:03 +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 10AA865C00; Fri, 6 Oct 2017 19:02:44 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 3007665BCE for ; Fri, 6 Oct 2017 19:00:47 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 2E30112435DE for ; Fri, 6 Oct 2017 22:00:46 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id fueqFzPHNQ-0eWWI6rf; Fri, 06 Oct 2017 22:00:40 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0dtedt9w; Fri, 06 Oct 2017 22:00:39 +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: Fri, 6 Oct 2017 22:00:05 +0300 Message-Id: <1507316415-2144-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 10/20] test: linux-gen: move platform-specific tests to platform directory 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ Makefile.am | 5 +++-- configure.ac | 1 - platform/linux-generic/Makefile.am | 2 ++ platform/linux-generic/m4/configure.m4 | 11 ++++++++++- {test => platform}/linux-generic/m4/performance.m4 | 0 .../linux-generic/test}/.gitignore | 0 .../linux-generic/test}/Makefile.am | 0 .../linux-generic/test}/Makefile.inc | 0 .../linux-generic/test}/mmap_vlan_ins/.gitignore | 0 .../linux-generic/test}/mmap_vlan_ins/Makefile.am | 0 .../linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.c | 0 .../linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.sh | 0 .../linux-generic/test}/mmap_vlan_ins/pktio_env | 0 .../linux-generic/test}/mmap_vlan_ins/vlan.pcap | Bin .../linux-generic/test}/performance/.gitignore | 0 .../linux-generic/test}/performance/Makefile.am | 0 .../test}/performance/odp_scheduling_run_proc.sh | 2 +- .../linux-generic/test}/pktio_ipc/.gitignore | 0 .../linux-generic/test}/pktio_ipc/Makefile.am | 0 .../linux-generic/test}/pktio_ipc/ipc_common.c | 0 .../linux-generic/test}/pktio_ipc/ipc_common.h | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/test}/pktio_ipc/pktio_ipc_run.sh | 0 .../linux-generic/test}/ring/.gitignore | 0 .../linux-generic/test}/ring/Makefile.am | 0 .../linux-generic/test}/ring/ring_basic.c | 0 .../linux-generic/test}/ring/ring_main.c | 0 .../linux-generic/test}/ring/ring_stress.c | 0 .../linux-generic/test}/ring/ring_suites.c | 0 .../linux-generic/test}/ring/ring_suites.h | 0 platform/linux-generic/test/validation/Makefile.inc | 1 + platform/linux-generic/test/validation/api/Makefile.inc | 1 + .../linux-generic/test}/validation/api/pktio/.gitignore | 0 .../linux-generic/test}/validation/api/pktio/Makefile.am | 0 .../linux-generic/test}/validation/api/pktio/pktio_env | 0 .../linux-generic/test}/validation/api/pktio/pktio_run.sh | 2 +- .../test}/validation/api/pktio/pktio_run_dpdk.sh | 2 +- .../test}/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test}/validation/api/pktio/pktio_run_tap.sh | 2 +- .../linux-generic/test}/validation/api/shmem/.gitignore | 0 .../linux-generic/test}/validation/api/shmem/Makefile.am | 0 .../linux-generic/test}/validation/api/shmem/shmem_common.h | 0 .../linux-generic/test}/validation/api/shmem/shmem_linux.c | 0 .../linux-generic/test}/validation/api/shmem/shmem_linux.h | 0 .../linux-generic/test}/validation/api/shmem/shmem_odp1.c | 0 .../linux-generic/test}/validation/api/shmem/shmem_odp1.h | 0 .../linux-generic/test}/validation/api/shmem/shmem_odp2.c | 0 .../linux-generic/test}/validation/api/shmem/shmem_odp2.h | 0 test/Makefile.am | 2 +- test/common_plat/performance/odp_l2fwd_run.sh | 2 +- test/linux-generic/m4/configure.m4 | 9 --------- test/linux-generic/validation/Makefile.inc | 1 - test/linux-generic/validation/api/Makefile.inc | 1 - test_common/Makefile.am | 12 +++++++++++- 56 files changed, 36 insertions(+), 24 deletions(-) rename {test => platform}/linux-generic/m4/performance.m4 (100%) rename {test/linux-generic => platform/linux-generic/test}/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/Makefile.inc (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.c (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/mmap_vlan_ins.sh (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/mmap_vlan_ins/vlan.pcap (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/performance/odp_scheduling_run_proc.sh (88%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/ipc_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/pktio_ipc/pktio_ipc_run.sh (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_basic.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_main.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_stress.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.c (100%) rename {test/linux-generic => platform/linux-generic/test}/ring/ring_suites.h (100%) create mode 100644 platform/linux-generic/test/validation/Makefile.inc create mode 100644 platform/linux-generic/test/validation/api/Makefile.inc rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_env (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run.sh (97%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_dpdk.sh (96%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_netmap.sh (96%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_pcap.sh (92%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/pktio/pktio_run_tap.sh (96%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/.gitignore (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/Makefile.am (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_common.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_linux.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp1.h (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.c (100%) rename {test/linux-generic => platform/linux-generic/test}/validation/api/shmem/shmem_odp2.h (100%) delete mode 100644 test/linux-generic/m4/configure.m4 delete mode 100644 test/linux-generic/validation/Makefile.inc delete mode 100644 test/linux-generic/validation/api/Makefile.inc diff --git a/Makefile.am b/Makefile.am index 774c09bda..0c28eb0c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,12 +4,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ --with-testdir #@with_platform@ works alone in subdir but not as part of a path??? -SUBDIRS = @platform_with_platform@ \ +SUBDIRS = \ + test_common \ helper \ + @platform_with_platform@ \ helper/test \ doc \ example . \ - test_common \ test @DX_RULES@ diff --git a/configure.ac b/configure.ac index 5bc84a71b..2b075e917 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,6 @@ IMPLEMENTATION_NAME="" if test "${with_platform}" = "linux-generic"; then m4_include([./platform/linux-generic/m4/configure.m4]) - m4_include([./test/linux-generic/m4/configure.m4]) IMPLEMENTATION_NAME="odp-linux" else echo "UNSUPPORTED PLATFORM: ${with_platform}" diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0ebb6f76c..7d79ccfc4 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,6 +3,8 @@ include $(top_srcdir)/platform/Makefile.inc +SUBDIRS = . test + AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 397c539b8..1a09102e7 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -9,5 +9,14 @@ m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) m4_include([platform/linux-generic/m4/odp_schedule.m4]) +m4_include([platform/linux-generic/m4/performance.m4]) + AC_CONFIG_FILES([platform/linux-generic/Makefile - platform/linux-generic/include/odp/api/plat/static_inline.h]) + platform/linux-generic/include/odp/api/plat/static_inline.h + platform/linux-generic/test/Makefile + platform/linux-generic/test/validation/api/shmem/Makefile + platform/linux-generic/test/validation/api/pktio/Makefile + platform/linux-generic/test/mmap_vlan_ins/Makefile + platform/linux-generic/test/pktio_ipc/Makefile + platform/linux-generic/test/ring/Makefile + platform/linux-generic/test/performance/Makefile]) diff --git a/test/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4 similarity index 100% rename from test/linux-generic/m4/performance.m4 rename to platform/linux-generic/m4/performance.m4 diff --git a/test/linux-generic/.gitignore b/platform/linux-generic/test/.gitignore similarity index 100% rename from test/linux-generic/.gitignore rename to platform/linux-generic/test/.gitignore diff --git a/test/linux-generic/Makefile.am b/platform/linux-generic/test/Makefile.am similarity index 100% rename from test/linux-generic/Makefile.am rename to platform/linux-generic/test/Makefile.am diff --git a/test/linux-generic/Makefile.inc b/platform/linux-generic/test/Makefile.inc similarity index 100% rename from test/linux-generic/Makefile.inc rename to platform/linux-generic/test/Makefile.inc diff --git a/test/linux-generic/mmap_vlan_ins/.gitignore b/platform/linux-generic/test/mmap_vlan_ins/.gitignore similarity index 100% rename from test/linux-generic/mmap_vlan_ins/.gitignore rename to platform/linux-generic/test/mmap_vlan_ins/.gitignore diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am similarity index 100% rename from test/linux-generic/mmap_vlan_ins/Makefile.am rename to platform/linux-generic/test/mmap_vlan_ins/Makefile.am diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c similarity index 100% rename from test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c rename to platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh similarity index 100% rename from test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh rename to platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh diff --git a/test/linux-generic/mmap_vlan_ins/pktio_env b/platform/linux-generic/test/mmap_vlan_ins/pktio_env similarity index 100% rename from test/linux-generic/mmap_vlan_ins/pktio_env rename to platform/linux-generic/test/mmap_vlan_ins/pktio_env diff --git a/test/linux-generic/mmap_vlan_ins/vlan.pcap b/platform/linux-generic/test/mmap_vlan_ins/vlan.pcap similarity index 100% rename from test/linux-generic/mmap_vlan_ins/vlan.pcap rename to platform/linux-generic/test/mmap_vlan_ins/vlan.pcap diff --git a/test/linux-generic/performance/.gitignore b/platform/linux-generic/test/performance/.gitignore similarity index 100% rename from test/linux-generic/performance/.gitignore rename to platform/linux-generic/test/performance/.gitignore diff --git a/test/linux-generic/performance/Makefile.am b/platform/linux-generic/test/performance/Makefile.am similarity index 100% rename from test/linux-generic/performance/Makefile.am rename to platform/linux-generic/test/performance/Makefile.am diff --git a/test/linux-generic/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh similarity index 88% rename from test/linux-generic/performance/odp_scheduling_run_proc.sh rename to platform/linux-generic/test/performance/odp_scheduling_run_proc.sh index 384017aff..a57df6c0b 100755 --- a/test/linux-generic/performance/odp_scheduling_run_proc.sh +++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh @@ -9,7 +9,7 @@ # launched by 'make check' TEST_DIR="${TEST_DIR:-$(dirname $0)}" -PERFORMANCE="$TEST_DIR/../../common_plat/performance" +PERFORMANCE="$TEST_DIR/../../../../test/common_plat/performance" ret=0 ALL=0 diff --git a/test/linux-generic/pktio_ipc/.gitignore b/platform/linux-generic/test/pktio_ipc/.gitignore similarity index 100% rename from test/linux-generic/pktio_ipc/.gitignore rename to platform/linux-generic/test/pktio_ipc/.gitignore diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/platform/linux-generic/test/pktio_ipc/Makefile.am similarity index 100% rename from test/linux-generic/pktio_ipc/Makefile.am rename to platform/linux-generic/test/pktio_ipc/Makefile.am diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/platform/linux-generic/test/pktio_ipc/ipc_common.c similarity index 100% rename from test/linux-generic/pktio_ipc/ipc_common.c rename to platform/linux-generic/test/pktio_ipc/ipc_common.c diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/platform/linux-generic/test/pktio_ipc/ipc_common.h similarity index 100% rename from test/linux-generic/pktio_ipc/ipc_common.h rename to platform/linux-generic/test/pktio_ipc/ipc_common.h diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c similarity index 100% rename from test/linux-generic/pktio_ipc/pktio_ipc1.c rename to platform/linux-generic/test/pktio_ipc/pktio_ipc1.c diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c similarity index 100% rename from test/linux-generic/pktio_ipc/pktio_ipc2.c rename to platform/linux-generic/test/pktio_ipc/pktio_ipc2.c diff --git a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh b/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh similarity index 100% rename from test/linux-generic/pktio_ipc/pktio_ipc_run.sh rename to platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh diff --git a/test/linux-generic/ring/.gitignore b/platform/linux-generic/test/ring/.gitignore similarity index 100% rename from test/linux-generic/ring/.gitignore rename to platform/linux-generic/test/ring/.gitignore diff --git a/test/linux-generic/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am similarity index 100% rename from test/linux-generic/ring/Makefile.am rename to platform/linux-generic/test/ring/Makefile.am diff --git a/test/linux-generic/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c similarity index 100% rename from test/linux-generic/ring/ring_basic.c rename to platform/linux-generic/test/ring/ring_basic.c diff --git a/test/linux-generic/ring/ring_main.c b/platform/linux-generic/test/ring/ring_main.c similarity index 100% rename from test/linux-generic/ring/ring_main.c rename to platform/linux-generic/test/ring/ring_main.c diff --git a/test/linux-generic/ring/ring_stress.c b/platform/linux-generic/test/ring/ring_stress.c similarity index 100% rename from test/linux-generic/ring/ring_stress.c rename to platform/linux-generic/test/ring/ring_stress.c diff --git a/test/linux-generic/ring/ring_suites.c b/platform/linux-generic/test/ring/ring_suites.c similarity index 100% rename from test/linux-generic/ring/ring_suites.c rename to platform/linux-generic/test/ring/ring_suites.c diff --git a/test/linux-generic/ring/ring_suites.h b/platform/linux-generic/test/ring/ring_suites.h similarity index 100% rename from test/linux-generic/ring/ring_suites.h rename to platform/linux-generic/test/ring/ring_suites.h diff --git a/platform/linux-generic/test/validation/Makefile.inc b/platform/linux-generic/test/validation/Makefile.inc new file mode 100644 index 000000000..b9030850c --- /dev/null +++ b/platform/linux-generic/test/validation/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/platform/linux-generic/test/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc new file mode 100644 index 000000000..c47217d1a --- /dev/null +++ b/platform/linux-generic/test/validation/api/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc diff --git a/test/linux-generic/validation/api/pktio/.gitignore b/platform/linux-generic/test/validation/api/pktio/.gitignore similarity index 100% rename from test/linux-generic/validation/api/pktio/.gitignore rename to platform/linux-generic/test/validation/api/pktio/.gitignore diff --git a/test/linux-generic/validation/api/pktio/Makefile.am b/platform/linux-generic/test/validation/api/pktio/Makefile.am similarity index 100% rename from test/linux-generic/validation/api/pktio/Makefile.am rename to platform/linux-generic/test/validation/api/pktio/Makefile.am diff --git a/test/linux-generic/validation/api/pktio/pktio_env b/platform/linux-generic/test/validation/api/pktio/pktio_env similarity index 100% rename from test/linux-generic/validation/api/pktio/pktio_env rename to platform/linux-generic/test/validation/api/pktio/pktio_env diff --git a/test/linux-generic/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh similarity index 97% rename from test/linux-generic/validation/api/pktio/pktio_run.sh rename to platform/linux-generic/test/validation/api/pktio/pktio_run.sh index 19def8c5a..075929e8c 100755 --- a/test/linux-generic/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh similarity index 96% rename from test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh rename to platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 3060dc003..0baf7e132 100755 --- a/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh similarity index 96% rename from test/linux-generic/validation/api/pktio/pktio_run_netmap.sh rename to platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh index 7dde7ae1c..bf4123767 100755 --- a/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh similarity index 92% rename from test/linux-generic/validation/api/pktio/pktio_run_pcap.sh rename to platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index b5b773548..4b5a0b3f1 100755 --- a/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/linux-generic/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh similarity index 96% rename from test/linux-generic/validation/api/pktio/pktio_run_tap.sh rename to platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh index 89579ca68..e5b72335d 100755 --- a/test/linux-generic/validation/api/pktio/pktio_run_tap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh @@ -18,7 +18,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/linux-generic/validation/api/shmem/.gitignore b/platform/linux-generic/test/validation/api/shmem/.gitignore similarity index 100% rename from test/linux-generic/validation/api/shmem/.gitignore rename to platform/linux-generic/test/validation/api/shmem/.gitignore diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am similarity index 100% rename from test/linux-generic/validation/api/shmem/Makefile.am rename to platform/linux-generic/test/validation/api/shmem/Makefile.am diff --git a/test/linux-generic/validation/api/shmem/shmem_common.h b/platform/linux-generic/test/validation/api/shmem/shmem_common.h similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_common.h rename to platform/linux-generic/test/validation/api/shmem/shmem_common.h diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_linux.c rename to platform/linux-generic/test/validation/api/shmem/shmem_linux.c diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.h b/platform/linux-generic/test/validation/api/shmem/shmem_linux.h similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_linux.h rename to platform/linux-generic/test/validation/api/shmem/shmem_linux.h diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_odp1.c rename to platform/linux-generic/test/validation/api/shmem/shmem_odp1.c diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_odp1.h rename to platform/linux-generic/test/validation/api/shmem/shmem_odp1.h diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_odp2.c rename to platform/linux-generic/test/validation/api/shmem/shmem_odp2.c diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h similarity index 100% rename from test/linux-generic/validation/api/shmem/shmem_odp2.h rename to platform/linux-generic/test/validation/api/shmem/shmem_odp2.h diff --git a/test/Makefile.am b/test/Makefile.am index 3b5917329..67ae76aed 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1 @@ -SUBDIRS = common_plat @with_platform@ +SUBDIRS = common_plat diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 6871e4b07..b3148f81f 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -30,7 +30,7 @@ PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 -PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$ODP_PLATFORM/validation +PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/validation FLOOD_MODE=0 diff --git a/test/linux-generic/m4/configure.m4 b/test/linux-generic/m4/configure.m4 deleted file mode 100644 index 8746dabc8..000000000 --- a/test/linux-generic/m4/configure.m4 +++ /dev/null @@ -1,9 +0,0 @@ -m4_include([test/linux-generic/m4/performance.m4]) - -AC_CONFIG_FILES([test/linux-generic/Makefile - test/linux-generic/validation/api/shmem/Makefile - test/linux-generic/validation/api/pktio/Makefile - test/linux-generic/mmap_vlan_ins/Makefile - test/linux-generic/pktio_ipc/Makefile - test/linux-generic/ring/Makefile - test/linux-generic/performance/Makefile]) diff --git a/test/linux-generic/validation/Makefile.inc b/test/linux-generic/validation/Makefile.inc deleted file mode 100644 index cf1dedb9f..000000000 --- a/test/linux-generic/validation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/test/linux-generic/Makefile.inc diff --git a/test/linux-generic/validation/api/Makefile.inc b/test/linux-generic/validation/api/Makefile.inc deleted file mode 100644 index 19c9448c0..000000000 --- a/test/linux-generic/validation/api/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/test/linux-generic/validation/Makefile.inc diff --git a/test_common/Makefile.am b/test_common/Makefile.am index 4d6413eda..3262a6ce1 100644 --- a/test_common/Makefile.am +++ b/test_common/Makefile.am @@ -1,6 +1,16 @@ if cunit_support -include $(top_srcdir)/test/Makefile.inc +AM_CPPFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ + -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 + +AM_CFLAGS = $(CUNIT_CFLAGS) noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la From patchwork Fri Oct 6 19:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115121 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1706439edb; Fri, 6 Oct 2017 12:10:15 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDo/yhaLrgbEQi+J5sBbfxq45Y5DUaXlS0iLuMNkrHXMWvEMv4eTMU8RoAzI8VuNYDGAVr1 X-Received: by 10.55.12.130 with SMTP id 124mr18546761qkm.186.1507317015780; Fri, 06 Oct 2017 12:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317015; cv=none; d=google.com; s=arc-20160816; b=nLYI08G8osepjs1I/5A6DYuWHuHns4aLMdkX7TMWPJRO9l/LMqgWTA5OQ3PqUtNP5B m8v7ILMW28Q2IOtHM8eKFTvkoSW3iDflbal6DoWDp1y/j/z7tM5VovIvR/sg9Ay4Mjc2 4uXAruFmMgf5p6140+0dJ1AkKWj+FmxWM29kbUzSpCd/XoUlHw01hP+6gx6Zr/i0cMIS APUeXVyQY9wLLnd/aEciNo+xmZw4UrQBCHIiOXPFm49gXszPFSmZGeEktofZCpuy19KW 6BLNKFxz8NVyilhSHCfDaZawHoMRTmQtKgBuFBYtAnroxayjFoDYLZWaGTyKZ7nX73Lt cnIQ== 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=CqO2+5BLEDzyAp7JuXWhcD5JQyUKLjotwPxRPI+InJA=; b=rushC1ExHi0FyghwSYpKNSncDzwHGFUadKG7m41JSeIBPYpiJSL8PGN4AbNAKi0P1d MGO9iZVVevtjzzBuqwEe7j17oPLgOw5cYc0ey2MHjn2T8t0UGOTA3v2O6wP1C2ZXBBiC qMPCUibEelDID+fer9Ezvj0bydh18RFAkfV5ERNw02/sFr73dCPe35FtKccHzRV2760/ FQI9aaXaXnoCgOxFINkMdSRnk0h4CPVU5CtXlo5HG7TH+t1wozOxxKlccZnNSfndn1oA wmBAa0p2kM/LdsStPI0VwiiKSdEV83WawwRa1prEBgNBPtt7p16zABTOjv+L/uNARhbC iZVw== 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 y20si832701qtj.403.2017.10.06.12.10.15; Fri, 06 Oct 2017 12:10:15 -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 57BEF65BCE; Fri, 6 Oct 2017 19:10:15 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 B4C2165BBD; Fri, 6 Oct 2017 19:02:41 +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 E4CED65BE1; Fri, 6 Oct 2017 19:02:35 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id B494465BD2 for ; Fri, 6 Oct 2017 19:00:47 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward104j.mail.yandex.net (Yandex) with ESMTP id B1A40452B3 for ; Fri, 6 Oct 2017 22:00:46 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id P5fx7Yfowm-0kQeiJon; Fri, 06 Oct 2017 22:00:46 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0ktGfMCY; Fri, 06 Oct 2017 22:00:46 +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: Fri, 6 Oct 2017 22:00:06 +0300 Message-Id: <1507316415-2144-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 11/20] test: move test_debug.h to test_common 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ test/Makefile.inc | 2 +- test/common_plat/performance/Makefile.am | 3 --- test_common/Makefile.am | 1 + {test => test_common}/test_debug.h | 0 4 files changed, 2 insertions(+), 4 deletions(-) rename {test => test_common}/test_debug.h (100%) diff --git a/test/Makefile.inc b/test/Makefile.inc index a45fcf870..b39cbc4fd 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -12,7 +12,7 @@ INCFLAGS = \ -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_srcdir)/test_common \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) diff --git a/test/common_plat/performance/Makefile.am b/test/common_plat/performance/Makefile.am index ef9537b1b..8d9fd3593 100644 --- a/test/common_plat/performance/Makefile.am +++ b/test/common_plat/performance/Makefile.am @@ -24,9 +24,6 @@ endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -noinst_HEADERS = \ - $(top_srcdir)/test/test_debug.h - 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 diff --git a/test_common/Makefile.am b/test_common/Makefile.am index 3262a6ce1..2759e8ecb 100644 --- a/test_common/Makefile.am +++ b/test_common/Makefile.am @@ -24,4 +24,5 @@ libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK endif +noinst_HEADERS = test_debug.h dist_test_SCRIPTS = run-test.sh diff --git a/test/test_debug.h b/test_common/test_debug.h similarity index 100% rename from test/test_debug.h rename to test_common/test_debug.h From patchwork Fri Oct 6 19:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115124 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1710701edb; Fri, 6 Oct 2017 12:14:39 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCvDCI2pcxiluXb+QUzr3auKOCOWW/nFkSA/C68Gq90e3+uGuf/GupItoIU32/qZU+ZeZBb X-Received: by 10.107.204.5 with SMTP id c5mr3620090iog.66.1507317279699; Fri, 06 Oct 2017 12:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317279; cv=none; d=google.com; s=arc-20160816; b=KNehkQowQxk2stEOpktCILZahBiZrksQSb/oYdHFbWLzCBuspOf/CvIoBhcnmc1KPF 4bf36f7DIF10LkbNkD4XaxgwaRrdAQ2i3uploiTXzuGjR52gRMGkRxcR/S5+k/RHYSbi UlHlS0rGXAHTVB1tBqdYNMeI/TPfs5GB4jA6UtB/EKGMEQC7lnSho5OZALPr2NKqHYCR DtU8QoLTCwJ+mM6ebhxyKzPd4ilRZJ5wcIv8fwCJil2c3hI1BerJUkBa+wJDgZOIEAuW atG1rJR1H/SRaLmIt33MQ/E8kMrRjT7Nk7s869ExS4xuksoPBwhzqbKcpjQz//s5Lr7i k/Pg== 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=Ie8lU10K7cWQ0PqsxcI2AZ4uc2CIvPlspHHkrdUppkA=; b=VVXc9y/MVcX7KrSXFiBb32U3pWoUNnun3SNMjGBm0P5NuRRqgOVmht44eoTP2y6vFZ +fz+a01dkG+D2YoQE6WPIQldKmD1gZx7dbmjeVNajpxiMqvX3uIXScNRxCPurkILPiEi on64CVKMiEw/e4FF+dOU29xDdMwXvBtz1STqeyTaLb1g8quwSa9Ee0DfOrfjGQSY1q81 Siw50UyxRwk4nxUqhK6JiqnZdTH1Uk0S/x8eyrnVLSeL017n65BKopgmLfdsyoIVFE9S BWoMIijMP92jnJjEfcXpdnU6DS9Y9zaoTiJ8gZUsYN6wJzneLo3lPF2mMBn/rjjjbdGu rRTg== 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 s26si1544725ioe.205.2017.10.06.12.14.39; Fri, 06 Oct 2017 12:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1E55865BF5; Fri, 6 Oct 2017 19:14:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 1482865BD3; Fri, 6 Oct 2017 19:03:27 +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 D519665BE3; Fri, 6 Oct 2017 19:02:56 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 34D08644E7 for ; Fri, 6 Oct 2017 19:00:55 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 06B735D817F8 for ; Fri, 6 Oct 2017 22:00:54 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id V0VDlvOb7Z-0ln43cgv; Fri, 06 Oct 2017 22:00:47 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0kt4Jcvh; Fri, 06 Oct 2017 22:00:46 +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: Fri, 6 Oct 2017 22:00:07 +0300 Message-Id: <1507316415-2144-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 12/20] test: drop now-unused common_plat directory 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 All tests in test/ are now common to all platforms, so no point in specifying that via (the only) common_plat subdirectory inside test dir. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ platform/linux-generic/test/Makefile.am | 2 +- .../test/performance/odp_scheduling_run_proc.sh | 2 +- .../test/validation/api/pktio/pktio_run.sh | 2 +- .../test/validation/api/pktio/pktio_run_dpdk.sh | 2 +- .../test/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test/validation/api/pktio/pktio_run_tap.sh | 2 +- test/Makefile.am | 2 +- test/common_plat/Makefile.am | 1 - test/common_plat/m4/configure.m4 | 33 -------------------- test/m4/configure.m4 | 34 +++++++++++++++++++-- test/{common_plat => }/m4/miscellaneous.m4 | 0 test/{common_plat => }/m4/performance.m4 | 0 test/{common_plat => }/m4/validation.m4 | 0 test/{common_plat => }/miscellaneous/.gitignore | 0 test/{common_plat => }/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{common_plat => }/performance/.gitignore | 0 test/{common_plat => }/performance/Makefile.am | 0 test/{common_plat => }/performance/dummy_crc.h | 0 .../performance/odp_bench_packet.c | 0 test/{common_plat => }/performance/odp_crypto.c | 0 test/{common_plat => }/performance/odp_l2fwd.c | 0 .../{common_plat => }/performance/odp_l2fwd_run.sh | 4 +-- .../performance/odp_pktio_ordered.c | 0 .../performance/odp_pktio_ordered_run.sh | 0 .../{common_plat => }/performance/odp_pktio_perf.c | 0 .../performance/odp_sched_latency.c | 0 .../performance/odp_sched_latency_run.sh | 0 .../{common_plat => }/performance/odp_scheduling.c | 0 .../performance/odp_scheduling_run.sh | 0 test/{common_plat => }/performance/udp64.pcap | Bin test/{common_plat => }/validation/Makefile.am | 0 test/{common_plat => }/validation/api/.gitignore | 0 test/{common_plat => }/validation/api/Makefile.am | 2 +- test/{common_plat => }/validation/api/Makefile.inc | 0 test/{common_plat => }/validation/api/README | 0 .../validation/api/atomic/.gitignore | 0 .../validation/api/atomic/Makefile.am | 0 .../validation/api/atomic/atomic.c | 0 .../validation/api/atomic/atomic.h | 0 .../validation/api/atomic/atomic_main.c | 0 .../validation/api/barrier/.gitignore | 0 .../validation/api/barrier/Makefile.am | 0 .../validation/api/barrier/barrier.c | 0 .../validation/api/barrier/barrier.h | 0 .../validation/api/barrier/barrier_main.c | 0 .../validation/api/buffer/.gitignore | 0 .../validation/api/buffer/Makefile.am | 0 .../validation/api/buffer/buffer.c | 0 .../validation/api/buffer/buffer.h | 0 .../validation/api/buffer/buffer_main.c | 0 .../validation/api/classification/.gitignore | 0 .../validation/api/classification/Makefile.am | 0 .../validation/api/classification/classification.c | 0 .../validation/api/classification/classification.h | 0 .../api/classification/classification_main.c | 0 .../api/classification/odp_classification_basic.c | 0 .../api/classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 0 .../api/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api/cpumask/.gitignore | 0 .../validation/api/cpumask/Makefile.am | 0 .../validation/api/cpumask/cpumask.c | 0 .../validation/api/cpumask/cpumask.h | 0 .../validation/api/cpumask/cpumask_main.c | 0 .../validation/api/crypto/.gitignore | 0 .../validation/api/crypto/Makefile.am | 0 .../validation/api/crypto/crypto.c | 0 .../validation/api/crypto/crypto.h | 0 .../validation/api/crypto/crypto_main.c | 0 .../validation/api/crypto/odp_crypto_test_inp.c | 0 .../validation/api/crypto/odp_crypto_test_inp.h | 0 .../validation/api/crypto/test_vectors.h | 0 .../validation/api/crypto/test_vectors_len.h | 0 .../validation/api/errno/.gitignore | 0 .../validation/api/errno/Makefile.am | 0 .../{common_plat => }/validation/api/errno/errno.c | 0 .../{common_plat => }/validation/api/errno/errno.h | 0 .../validation/api/errno/errno_main.c | 0 .../validation/api/hash/.gitignore | 0 .../validation/api/hash/Makefile.am | 0 test/{common_plat => }/validation/api/hash/hash.c | 0 test/{common_plat => }/validation/api/hash/hash.h | 0 .../validation/api/hash/hash_main.c | 0 .../validation/api/init/.gitignore | 0 .../validation/api/init/Makefile.am | 0 test/{common_plat => }/validation/api/init/init.c | 0 test/{common_plat => }/validation/api/init/init.h | 0 .../validation/api/init/init_main_abort.c | 0 .../validation/api/init/init_main_log.c | 0 .../validation/api/init/init_main_ok.c | 0 .../validation/api/lock/.gitignore | 0 .../validation/api/lock/Makefile.am | 0 test/{common_plat => }/validation/api/lock/lock.c | 0 test/{common_plat => }/validation/api/lock/lock.h | 0 .../validation/api/lock/lock_main.c | 0 .../validation/api/packet/.gitignore | 0 .../validation/api/packet/Makefile.am | 0 .../validation/api/packet/packet.c | 0 .../validation/api/packet/packet.h | 0 .../validation/api/packet/packet_main.c | 0 .../validation/api/pktio/.gitignore | 0 .../validation/api/pktio/Makefile.am | 0 .../validation/api/pktio/parser.c | 0 .../validation/api/pktio/parser.h | 0 .../{common_plat => }/validation/api/pktio/pktio.c | 0 .../{common_plat => }/validation/api/pktio/pktio.h | 0 .../validation/api/pktio/pktio_main.c | 0 .../validation/api/pool/.gitignore | 0 .../validation/api/pool/Makefile.am | 0 test/{common_plat => }/validation/api/pool/pool.c | 0 test/{common_plat => }/validation/api/pool/pool.h | 0 .../validation/api/pool/pool_main.c | 0 .../validation/api/queue/.gitignore | 0 .../validation/api/queue/Makefile.am | 0 .../{common_plat => }/validation/api/queue/queue.c | 0 .../{common_plat => }/validation/api/queue/queue.h | 0 .../validation/api/queue/queue_main.c | 0 .../validation/api/random/.gitignore | 0 .../validation/api/random/Makefile.am | 0 .../validation/api/random/random.c | 0 .../validation/api/random/random.h | 0 .../validation/api/random/random_main.c | 0 .../validation/api/scheduler/.gitignore | 0 .../validation/api/scheduler/Makefile.am | 0 .../validation/api/scheduler/scheduler.c | 0 .../validation/api/scheduler/scheduler.h | 0 .../validation/api/scheduler/scheduler_main.c | 0 .../validation/api/shmem/.gitignore | 0 .../validation/api/shmem/Makefile.am | 0 .../{common_plat => }/validation/api/shmem/shmem.c | 0 .../{common_plat => }/validation/api/shmem/shmem.h | 0 .../validation/api/shmem/shmem_main.c | 0 .../validation/api/std_clib/.gitignore | 0 .../validation/api/std_clib/Makefile.am | 0 .../validation/api/std_clib/std_clib.c | 0 .../validation/api/std_clib/std_clib.h | 0 .../validation/api/std_clib/std_clib_main.c | 0 .../validation/api/system/.gitignore | 0 .../validation/api/system/Makefile.am | 0 .../validation/api/system/system.c | 0 .../validation/api/system/system.h | 0 .../validation/api/system/system_main.c | 0 .../validation/api/thread/.gitignore | 0 .../validation/api/thread/Makefile.am | 0 .../validation/api/thread/thread.c | 0 .../validation/api/thread/thread.h | 0 .../validation/api/thread/thread_main.c | 0 .../validation/api/time/.gitignore | 0 .../validation/api/time/Makefile.am | 0 test/{common_plat => }/validation/api/time/time.c | 0 test/{common_plat => }/validation/api/time/time.sh | 2 +- .../validation/api/time/time_main.c | 0 .../validation/api/time/time_test.h | 0 .../validation/api/timer/.gitignore | 0 .../validation/api/timer/Makefile.am | 0 .../{common_plat => }/validation/api/timer/timer.c | 0 .../{common_plat => }/validation/api/timer/timer.h | 0 .../validation/api/timer/timer_main.c | 0 .../validation/api/traffic_mngr/.gitignore | 0 .../validation/api/traffic_mngr/Makefile.am | 0 .../validation/api/traffic_mngr/traffic_mngr.c | 0 .../validation/api/traffic_mngr/traffic_mngr.h | 0 .../validation/api/traffic_mngr/traffic_mngr.sh | 2 +- .../api/traffic_mngr/traffic_mngr_main.c | 0 167 files changed, 45 insertions(+), 49 deletions(-) delete mode 100644 test/common_plat/Makefile.am delete mode 100644 test/common_plat/m4/configure.m4 rename test/{common_plat => }/m4/miscellaneous.m4 (100%) rename test/{common_plat => }/m4/performance.m4 (100%) rename test/{common_plat => }/m4/validation.m4 (100%) rename test/{common_plat => }/miscellaneous/.gitignore (100%) rename test/{common_plat => }/miscellaneous/Makefile.am (100%) rename test/{common_plat => }/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{common_plat => }/performance/.gitignore (100%) rename test/{common_plat => }/performance/Makefile.am (100%) rename test/{common_plat => }/performance/dummy_crc.h (100%) rename test/{common_plat => }/performance/odp_bench_packet.c (100%) rename test/{common_plat => }/performance/odp_crypto.c (100%) rename test/{common_plat => }/performance/odp_l2fwd.c (100%) rename test/{common_plat => }/performance/odp_l2fwd_run.sh (95%) rename test/{common_plat => }/performance/odp_pktio_ordered.c (100%) rename test/{common_plat => }/performance/odp_pktio_ordered_run.sh (100%) rename test/{common_plat => }/performance/odp_pktio_perf.c (100%) rename test/{common_plat => }/performance/odp_sched_latency.c (100%) rename test/{common_plat => }/performance/odp_sched_latency_run.sh (100%) rename test/{common_plat => }/performance/odp_scheduling.c (100%) rename test/{common_plat => }/performance/odp_scheduling_run.sh (100%) rename test/{common_plat => }/performance/udp64.pcap (100%) rename test/{common_plat => }/validation/Makefile.am (100%) rename test/{common_plat => }/validation/api/.gitignore (100%) rename test/{common_plat => }/validation/api/Makefile.am (95%) rename test/{common_plat => }/validation/api/Makefile.inc (100%) rename test/{common_plat => }/validation/api/README (100%) rename test/{common_plat => }/validation/api/atomic/.gitignore (100%) rename test/{common_plat => }/validation/api/atomic/Makefile.am (100%) rename test/{common_plat => }/validation/api/atomic/atomic.c (100%) rename test/{common_plat => }/validation/api/atomic/atomic.h (100%) rename test/{common_plat => }/validation/api/atomic/atomic_main.c (100%) rename test/{common_plat => }/validation/api/barrier/.gitignore (100%) rename test/{common_plat => }/validation/api/barrier/Makefile.am (100%) rename test/{common_plat => }/validation/api/barrier/barrier.c (100%) rename test/{common_plat => }/validation/api/barrier/barrier.h (100%) rename test/{common_plat => }/validation/api/barrier/barrier_main.c (100%) rename test/{common_plat => }/validation/api/buffer/.gitignore (100%) rename test/{common_plat => }/validation/api/buffer/Makefile.am (100%) rename test/{common_plat => }/validation/api/buffer/buffer.c (100%) rename test/{common_plat => }/validation/api/buffer/buffer.h (100%) rename test/{common_plat => }/validation/api/buffer/buffer_main.c (100%) rename test/{common_plat => }/validation/api/classification/.gitignore (100%) rename test/{common_plat => }/validation/api/classification/Makefile.am (100%) rename test/{common_plat => }/validation/api/classification/classification.c (100%) rename test/{common_plat => }/validation/api/classification/classification.h (100%) rename test/{common_plat => }/validation/api/classification/classification_main.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_basic.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_common.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_test_pmr.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_tests.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_testsuites.h (100%) rename test/{common_plat => }/validation/api/cpumask/.gitignore (100%) rename test/{common_plat => }/validation/api/cpumask/Makefile.am (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.c (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.h (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask_main.c (100%) rename test/{common_plat => }/validation/api/crypto/.gitignore (100%) rename test/{common_plat => }/validation/api/crypto/Makefile.am (100%) rename test/{common_plat => }/validation/api/crypto/crypto.c (100%) rename test/{common_plat => }/validation/api/crypto/crypto.h (100%) rename test/{common_plat => }/validation/api/crypto/crypto_main.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors_len.h (100%) rename test/{common_plat => }/validation/api/errno/.gitignore (100%) rename test/{common_plat => }/validation/api/errno/Makefile.am (100%) rename test/{common_plat => }/validation/api/errno/errno.c (100%) rename test/{common_plat => }/validation/api/errno/errno.h (100%) rename test/{common_plat => }/validation/api/errno/errno_main.c (100%) rename test/{common_plat => }/validation/api/hash/.gitignore (100%) rename test/{common_plat => }/validation/api/hash/Makefile.am (100%) rename test/{common_plat => }/validation/api/hash/hash.c (100%) rename test/{common_plat => }/validation/api/hash/hash.h (100%) rename test/{common_plat => }/validation/api/hash/hash_main.c (100%) rename test/{common_plat => }/validation/api/init/.gitignore (100%) rename test/{common_plat => }/validation/api/init/Makefile.am (100%) rename test/{common_plat => }/validation/api/init/init.c (100%) rename test/{common_plat => }/validation/api/init/init.h (100%) rename test/{common_plat => }/validation/api/init/init_main_abort.c (100%) rename test/{common_plat => }/validation/api/init/init_main_log.c (100%) rename test/{common_plat => }/validation/api/init/init_main_ok.c (100%) rename test/{common_plat => }/validation/api/lock/.gitignore (100%) rename test/{common_plat => }/validation/api/lock/Makefile.am (100%) rename test/{common_plat => }/validation/api/lock/lock.c (100%) rename test/{common_plat => }/validation/api/lock/lock.h (100%) rename test/{common_plat => }/validation/api/lock/lock_main.c (100%) rename test/{common_plat => }/validation/api/packet/.gitignore (100%) rename test/{common_plat => }/validation/api/packet/Makefile.am (100%) rename test/{common_plat => }/validation/api/packet/packet.c (100%) rename test/{common_plat => }/validation/api/packet/packet.h (100%) rename test/{common_plat => }/validation/api/packet/packet_main.c (100%) rename test/{common_plat => }/validation/api/pktio/.gitignore (100%) rename test/{common_plat => }/validation/api/pktio/Makefile.am (100%) rename test/{common_plat => }/validation/api/pktio/parser.c (100%) rename test/{common_plat => }/validation/api/pktio/parser.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio.c (100%) rename test/{common_plat => }/validation/api/pktio/pktio.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio_main.c (100%) rename test/{common_plat => }/validation/api/pool/.gitignore (100%) rename test/{common_plat => }/validation/api/pool/Makefile.am (100%) rename test/{common_plat => }/validation/api/pool/pool.c (100%) rename test/{common_plat => }/validation/api/pool/pool.h (100%) rename test/{common_plat => }/validation/api/pool/pool_main.c (100%) rename test/{common_plat => }/validation/api/queue/.gitignore (100%) rename test/{common_plat => }/validation/api/queue/Makefile.am (100%) rename test/{common_plat => }/validation/api/queue/queue.c (100%) rename test/{common_plat => }/validation/api/queue/queue.h (100%) rename test/{common_plat => }/validation/api/queue/queue_main.c (100%) rename test/{common_plat => }/validation/api/random/.gitignore (100%) rename test/{common_plat => }/validation/api/random/Makefile.am (100%) rename test/{common_plat => }/validation/api/random/random.c (100%) rename test/{common_plat => }/validation/api/random/random.h (100%) rename test/{common_plat => }/validation/api/random/random_main.c (100%) rename test/{common_plat => }/validation/api/scheduler/.gitignore (100%) rename test/{common_plat => }/validation/api/scheduler/Makefile.am (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.c (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.h (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler_main.c (100%) rename test/{common_plat => }/validation/api/shmem/.gitignore (100%) rename test/{common_plat => }/validation/api/shmem/Makefile.am (100%) rename test/{common_plat => }/validation/api/shmem/shmem.c (100%) rename test/{common_plat => }/validation/api/shmem/shmem.h (100%) rename test/{common_plat => }/validation/api/shmem/shmem_main.c (100%) rename test/{common_plat => }/validation/api/std_clib/.gitignore (100%) rename test/{common_plat => }/validation/api/std_clib/Makefile.am (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.c (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.h (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib_main.c (100%) rename test/{common_plat => }/validation/api/system/.gitignore (100%) rename test/{common_plat => }/validation/api/system/Makefile.am (100%) rename test/{common_plat => }/validation/api/system/system.c (100%) rename test/{common_plat => }/validation/api/system/system.h (100%) rename test/{common_plat => }/validation/api/system/system_main.c (100%) rename test/{common_plat => }/validation/api/thread/.gitignore (100%) rename test/{common_plat => }/validation/api/thread/Makefile.am (100%) rename test/{common_plat => }/validation/api/thread/thread.c (100%) rename test/{common_plat => }/validation/api/thread/thread.h (100%) rename test/{common_plat => }/validation/api/thread/thread_main.c (100%) rename test/{common_plat => }/validation/api/time/.gitignore (100%) rename test/{common_plat => }/validation/api/time/Makefile.am (100%) rename test/{common_plat => }/validation/api/time/time.c (100%) rename test/{common_plat => }/validation/api/time/time.sh (93%) rename test/{common_plat => }/validation/api/time/time_main.c (100%) rename test/{common_plat => }/validation/api/time/time_test.h (100%) rename test/{common_plat => }/validation/api/timer/.gitignore (100%) rename test/{common_plat => }/validation/api/timer/Makefile.am (100%) rename test/{common_plat => }/validation/api/timer/timer.c (100%) rename test/{common_plat => }/validation/api/timer/timer.h (100%) rename test/{common_plat => }/validation/api/timer/timer_main.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/.gitignore (100%) rename test/{common_plat => }/validation/api/traffic_mngr/Makefile.am (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.h (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.sh (93%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr_main.c (100%) diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index c65a26fd7..1f4910ad2 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh index a57df6c0b..598e5b837 100755 --- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh +++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh @@ -9,7 +9,7 @@ # launched by 'make check' TEST_DIR="${TEST_DIR:-$(dirname $0)}" -PERFORMANCE="$TEST_DIR/../../../../test/common_plat/performance" +PERFORMANCE="$TEST_DIR/../../../../test/performance" ret=0 ALL=0 diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh index 075929e8c..5b861bbbf 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 0baf7e132..14759142d 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh index bf4123767..610be3bdc 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index 4b5a0b3f1..bf9fc4560 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh index e5b72335d..ecfe5a126 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh @@ -18,7 +18,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/Makefile.am b/test/Makefile.am index 67ae76aed..80c35f870 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1 @@ -SUBDIRS = common_plat +SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am deleted file mode 100644 index 80c35f870..000000000 --- a/test/common_plat/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 deleted file mode 100644 index e04737e18..000000000 --- a/test/common_plat/m4/configure.m4 +++ /dev/null @@ -1,33 +0,0 @@ -m4_include([test/common_plat/m4/miscellaneous.m4]) -m4_include([test/common_plat/m4/performance.m4]) -m4_include([test/common_plat/m4/validation.m4]) - -AC_CONFIG_FILES([test_common/Makefile - test/common_plat/Makefile - test/common_plat/miscellaneous/Makefile - test/common_plat/performance/Makefile - test/common_plat/validation/Makefile - test/common_plat/validation/api/atomic/Makefile - test/common_plat/validation/api/barrier/Makefile - test/common_plat/validation/api/buffer/Makefile - test/common_plat/validation/api/classification/Makefile - test/common_plat/validation/api/cpumask/Makefile - test/common_plat/validation/api/crypto/Makefile - test/common_plat/validation/api/errno/Makefile - test/common_plat/validation/api/hash/Makefile - test/common_plat/validation/api/init/Makefile - test/common_plat/validation/api/lock/Makefile - test/common_plat/validation/api/Makefile - test/common_plat/validation/api/packet/Makefile - test/common_plat/validation/api/pktio/Makefile - test/common_plat/validation/api/pool/Makefile - test/common_plat/validation/api/queue/Makefile - test/common_plat/validation/api/random/Makefile - test/common_plat/validation/api/scheduler/Makefile - test/common_plat/validation/api/shmem/Makefile - test/common_plat/validation/api/std_clib/Makefile - test/common_plat/validation/api/system/Makefile - test/common_plat/validation/api/thread/Makefile - test/common_plat/validation/api/time/Makefile - test/common_plat/validation/api/timer/Makefile - test/common_plat/validation/api/traffic_mngr/Makefile]) diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 460e8449f..07ae1cf15 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -1,3 +1,33 @@ -m4_include([test/common_plat/m4/configure.m4]) +m4_include([test/m4/miscellaneous.m4]) +m4_include([test/m4/performance.m4]) +m4_include([test/m4/validation.m4]) -AC_CONFIG_FILES([test/Makefile]) +AC_CONFIG_FILES([test_common/Makefile + test/Makefile + test/miscellaneous/Makefile + test/performance/Makefile + test/validation/Makefile + test/validation/api/atomic/Makefile + test/validation/api/barrier/Makefile + test/validation/api/buffer/Makefile + test/validation/api/classification/Makefile + test/validation/api/cpumask/Makefile + test/validation/api/crypto/Makefile + test/validation/api/errno/Makefile + test/validation/api/hash/Makefile + test/validation/api/init/Makefile + test/validation/api/lock/Makefile + test/validation/api/Makefile + test/validation/api/packet/Makefile + test/validation/api/pktio/Makefile + test/validation/api/pool/Makefile + test/validation/api/queue/Makefile + test/validation/api/random/Makefile + test/validation/api/scheduler/Makefile + test/validation/api/shmem/Makefile + test/validation/api/std_clib/Makefile + test/validation/api/system/Makefile + test/validation/api/thread/Makefile + test/validation/api/time/Makefile + test/validation/api/timer/Makefile + test/validation/api/traffic_mngr/Makefile]) diff --git a/test/common_plat/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4 similarity index 100% rename from test/common_plat/m4/miscellaneous.m4 rename to test/m4/miscellaneous.m4 diff --git a/test/common_plat/m4/performance.m4 b/test/m4/performance.m4 similarity index 100% rename from test/common_plat/m4/performance.m4 rename to test/m4/performance.m4 diff --git a/test/common_plat/m4/validation.m4 b/test/m4/validation.m4 similarity index 100% rename from test/common_plat/m4/validation.m4 rename to test/m4/validation.m4 diff --git a/test/common_plat/miscellaneous/.gitignore b/test/miscellaneous/.gitignore similarity index 100% rename from test/common_plat/miscellaneous/.gitignore rename to test/miscellaneous/.gitignore diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am similarity index 100% rename from test/common_plat/miscellaneous/Makefile.am rename to test/miscellaneous/Makefile.am diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp similarity index 100% rename from test/common_plat/miscellaneous/odp_api_from_cpp.cpp rename to test/miscellaneous/odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/.gitignore b/test/performance/.gitignore similarity index 100% rename from test/common_plat/performance/.gitignore rename to test/performance/.gitignore diff --git a/test/common_plat/performance/Makefile.am b/test/performance/Makefile.am similarity index 100% rename from test/common_plat/performance/Makefile.am rename to test/performance/Makefile.am diff --git a/test/common_plat/performance/dummy_crc.h b/test/performance/dummy_crc.h similarity index 100% rename from test/common_plat/performance/dummy_crc.h rename to test/performance/dummy_crc.h diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c similarity index 100% rename from test/common_plat/performance/odp_bench_packet.c rename to test/performance/odp_bench_packet.c diff --git a/test/common_plat/performance/odp_crypto.c b/test/performance/odp_crypto.c similarity index 100% rename from test/common_plat/performance/odp_crypto.c rename to test/performance/odp_crypto.c diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c similarity index 100% rename from test/common_plat/performance/odp_l2fwd.c rename to test/performance/odp_l2fwd.c diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh similarity index 95% rename from test/common_plat/performance/odp_l2fwd_run.sh rename to test/performance/odp_l2fwd_run.sh index b3148f81f..d14b86164 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -25,12 +25,12 @@ TEST_DIR="${TEST_DIR:-$PWD}" # directory where test sources are, including scripts TEST_SRC_DIR=$(dirname $0) -PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 -PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/validation +PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation FLOOD_MODE=0 diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c similarity index 100% rename from test/common_plat/performance/odp_pktio_ordered.c rename to test/performance/odp_pktio_ordered.c diff --git a/test/common_plat/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh similarity index 100% rename from test/common_plat/performance/odp_pktio_ordered_run.sh rename to test/performance/odp_pktio_ordered_run.sh diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c similarity index 100% rename from test/common_plat/performance/odp_pktio_perf.c rename to test/performance/odp_pktio_perf.c diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c similarity index 100% rename from test/common_plat/performance/odp_sched_latency.c rename to test/performance/odp_sched_latency.c diff --git a/test/common_plat/performance/odp_sched_latency_run.sh b/test/performance/odp_sched_latency_run.sh similarity index 100% rename from test/common_plat/performance/odp_sched_latency_run.sh rename to test/performance/odp_sched_latency_run.sh diff --git a/test/common_plat/performance/odp_scheduling.c b/test/performance/odp_scheduling.c similarity index 100% rename from test/common_plat/performance/odp_scheduling.c rename to test/performance/odp_scheduling.c diff --git a/test/common_plat/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh similarity index 100% rename from test/common_plat/performance/odp_scheduling_run.sh rename to test/performance/odp_scheduling_run.sh diff --git a/test/common_plat/performance/udp64.pcap b/test/performance/udp64.pcap similarity index 100% rename from test/common_plat/performance/udp64.pcap rename to test/performance/udp64.pcap diff --git a/test/common_plat/validation/Makefile.am b/test/validation/Makefile.am similarity index 100% rename from test/common_plat/validation/Makefile.am rename to test/validation/Makefile.am diff --git a/test/common_plat/validation/api/.gitignore b/test/validation/api/.gitignore similarity index 100% rename from test/common_plat/validation/api/.gitignore rename to test/validation/api/.gitignore diff --git a/test/common_plat/validation/api/Makefile.am b/test/validation/api/Makefile.am similarity index 95% rename from test/common_plat/validation/api/Makefile.am rename to test/validation/api/Makefile.am index e891c94cb..730a336d5 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -25,7 +25,7 @@ ODP_MODULES = atomic \ SUBDIRS = $(ODP_MODULES) include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation TESTS = \ atomic/atomic_main$(EXEEXT) \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/validation/api/Makefile.inc similarity index 100% rename from test/common_plat/validation/api/Makefile.inc rename to test/validation/api/Makefile.inc diff --git a/test/common_plat/validation/api/README b/test/validation/api/README similarity index 100% rename from test/common_plat/validation/api/README rename to test/validation/api/README diff --git a/test/common_plat/validation/api/atomic/.gitignore b/test/validation/api/atomic/.gitignore similarity index 100% rename from test/common_plat/validation/api/atomic/.gitignore rename to test/validation/api/atomic/.gitignore diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am similarity index 100% rename from test/common_plat/validation/api/atomic/Makefile.am rename to test/validation/api/atomic/Makefile.am diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c similarity index 100% rename from test/common_plat/validation/api/atomic/atomic.c rename to test/validation/api/atomic/atomic.c diff --git a/test/common_plat/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h similarity index 100% rename from test/common_plat/validation/api/atomic/atomic.h rename to test/validation/api/atomic/atomic.h diff --git a/test/common_plat/validation/api/atomic/atomic_main.c b/test/validation/api/atomic/atomic_main.c similarity index 100% rename from test/common_plat/validation/api/atomic/atomic_main.c rename to test/validation/api/atomic/atomic_main.c diff --git a/test/common_plat/validation/api/barrier/.gitignore b/test/validation/api/barrier/.gitignore similarity index 100% rename from test/common_plat/validation/api/barrier/.gitignore rename to test/validation/api/barrier/.gitignore diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am similarity index 100% rename from test/common_plat/validation/api/barrier/Makefile.am rename to test/validation/api/barrier/Makefile.am diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c similarity index 100% rename from test/common_plat/validation/api/barrier/barrier.c rename to test/validation/api/barrier/barrier.c diff --git a/test/common_plat/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h similarity index 100% rename from test/common_plat/validation/api/barrier/barrier.h rename to test/validation/api/barrier/barrier.h diff --git a/test/common_plat/validation/api/barrier/barrier_main.c b/test/validation/api/barrier/barrier_main.c similarity index 100% rename from test/common_plat/validation/api/barrier/barrier_main.c rename to test/validation/api/barrier/barrier_main.c diff --git a/test/common_plat/validation/api/buffer/.gitignore b/test/validation/api/buffer/.gitignore similarity index 100% rename from test/common_plat/validation/api/buffer/.gitignore rename to test/validation/api/buffer/.gitignore diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am similarity index 100% rename from test/common_plat/validation/api/buffer/Makefile.am rename to test/validation/api/buffer/Makefile.am diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c similarity index 100% rename from test/common_plat/validation/api/buffer/buffer.c rename to test/validation/api/buffer/buffer.c diff --git a/test/common_plat/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h similarity index 100% rename from test/common_plat/validation/api/buffer/buffer.h rename to test/validation/api/buffer/buffer.h diff --git a/test/common_plat/validation/api/buffer/buffer_main.c b/test/validation/api/buffer/buffer_main.c similarity index 100% rename from test/common_plat/validation/api/buffer/buffer_main.c rename to test/validation/api/buffer/buffer_main.c diff --git a/test/common_plat/validation/api/classification/.gitignore b/test/validation/api/classification/.gitignore similarity index 100% rename from test/common_plat/validation/api/classification/.gitignore rename to test/validation/api/classification/.gitignore diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am similarity index 100% rename from test/common_plat/validation/api/classification/Makefile.am rename to test/validation/api/classification/Makefile.am diff --git a/test/common_plat/validation/api/classification/classification.c b/test/validation/api/classification/classification.c similarity index 100% rename from test/common_plat/validation/api/classification/classification.c rename to test/validation/api/classification/classification.c diff --git a/test/common_plat/validation/api/classification/classification.h b/test/validation/api/classification/classification.h similarity index 100% rename from test/common_plat/validation/api/classification/classification.h rename to test/validation/api/classification/classification.h diff --git a/test/common_plat/validation/api/classification/classification_main.c b/test/validation/api/classification/classification_main.c similarity index 100% rename from test/common_plat/validation/api/classification/classification_main.c rename to test/validation/api/classification/classification_main.c diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_basic.c rename to test/validation/api/classification/odp_classification_basic.c diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_common.c rename to test/validation/api/classification/odp_classification_common.c diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_test_pmr.c rename to test/validation/api/classification/odp_classification_test_pmr.c diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_tests.c rename to test/validation/api/classification/odp_classification_tests.c diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_testsuites.h rename to test/validation/api/classification/odp_classification_testsuites.h diff --git a/test/common_plat/validation/api/cpumask/.gitignore b/test/validation/api/cpumask/.gitignore similarity index 100% rename from test/common_plat/validation/api/cpumask/.gitignore rename to test/validation/api/cpumask/.gitignore diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am similarity index 100% rename from test/common_plat/validation/api/cpumask/Makefile.am rename to test/validation/api/cpumask/Makefile.am diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask.c rename to test/validation/api/cpumask/cpumask.c diff --git a/test/common_plat/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask.h rename to test/validation/api/cpumask/cpumask.h diff --git a/test/common_plat/validation/api/cpumask/cpumask_main.c b/test/validation/api/cpumask/cpumask_main.c similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask_main.c rename to test/validation/api/cpumask/cpumask_main.c diff --git a/test/common_plat/validation/api/crypto/.gitignore b/test/validation/api/crypto/.gitignore similarity index 100% rename from test/common_plat/validation/api/crypto/.gitignore rename to test/validation/api/crypto/.gitignore diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am similarity index 100% rename from test/common_plat/validation/api/crypto/Makefile.am rename to test/validation/api/crypto/Makefile.am diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c similarity index 100% rename from test/common_plat/validation/api/crypto/crypto.c rename to test/validation/api/crypto/crypto.c diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h similarity index 100% rename from test/common_plat/validation/api/crypto/crypto.h rename to test/validation/api/crypto/crypto.h diff --git a/test/common_plat/validation/api/crypto/crypto_main.c b/test/validation/api/crypto/crypto_main.c similarity index 100% rename from test/common_plat/validation/api/crypto/crypto_main.c rename to test/validation/api/crypto/crypto_main.c diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c similarity index 100% rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.c rename to test/validation/api/crypto/odp_crypto_test_inp.c diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/validation/api/crypto/odp_crypto_test_inp.h similarity index 100% rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.h rename to test/validation/api/crypto/odp_crypto_test_inp.h diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h similarity index 100% rename from test/common_plat/validation/api/crypto/test_vectors.h rename to test/validation/api/crypto/test_vectors.h diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h similarity index 100% rename from test/common_plat/validation/api/crypto/test_vectors_len.h rename to test/validation/api/crypto/test_vectors_len.h diff --git a/test/common_plat/validation/api/errno/.gitignore b/test/validation/api/errno/.gitignore similarity index 100% rename from test/common_plat/validation/api/errno/.gitignore rename to test/validation/api/errno/.gitignore diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am similarity index 100% rename from test/common_plat/validation/api/errno/Makefile.am rename to test/validation/api/errno/Makefile.am diff --git a/test/common_plat/validation/api/errno/errno.c b/test/validation/api/errno/errno.c similarity index 100% rename from test/common_plat/validation/api/errno/errno.c rename to test/validation/api/errno/errno.c diff --git a/test/common_plat/validation/api/errno/errno.h b/test/validation/api/errno/errno.h similarity index 100% rename from test/common_plat/validation/api/errno/errno.h rename to test/validation/api/errno/errno.h diff --git a/test/common_plat/validation/api/errno/errno_main.c b/test/validation/api/errno/errno_main.c similarity index 100% rename from test/common_plat/validation/api/errno/errno_main.c rename to test/validation/api/errno/errno_main.c diff --git a/test/common_plat/validation/api/hash/.gitignore b/test/validation/api/hash/.gitignore similarity index 100% rename from test/common_plat/validation/api/hash/.gitignore rename to test/validation/api/hash/.gitignore diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am similarity index 100% rename from test/common_plat/validation/api/hash/Makefile.am rename to test/validation/api/hash/Makefile.am diff --git a/test/common_plat/validation/api/hash/hash.c b/test/validation/api/hash/hash.c similarity index 100% rename from test/common_plat/validation/api/hash/hash.c rename to test/validation/api/hash/hash.c diff --git a/test/common_plat/validation/api/hash/hash.h b/test/validation/api/hash/hash.h similarity index 100% rename from test/common_plat/validation/api/hash/hash.h rename to test/validation/api/hash/hash.h diff --git a/test/common_plat/validation/api/hash/hash_main.c b/test/validation/api/hash/hash_main.c similarity index 100% rename from test/common_plat/validation/api/hash/hash_main.c rename to test/validation/api/hash/hash_main.c diff --git a/test/common_plat/validation/api/init/.gitignore b/test/validation/api/init/.gitignore similarity index 100% rename from test/common_plat/validation/api/init/.gitignore rename to test/validation/api/init/.gitignore diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am similarity index 100% rename from test/common_plat/validation/api/init/Makefile.am rename to test/validation/api/init/Makefile.am diff --git a/test/common_plat/validation/api/init/init.c b/test/validation/api/init/init.c similarity index 100% rename from test/common_plat/validation/api/init/init.c rename to test/validation/api/init/init.c diff --git a/test/common_plat/validation/api/init/init.h b/test/validation/api/init/init.h similarity index 100% rename from test/common_plat/validation/api/init/init.h rename to test/validation/api/init/init.h diff --git a/test/common_plat/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_abort.c rename to test/validation/api/init/init_main_abort.c diff --git a/test/common_plat/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_log.c rename to test/validation/api/init/init_main_log.c diff --git a/test/common_plat/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_ok.c rename to test/validation/api/init/init_main_ok.c diff --git a/test/common_plat/validation/api/lock/.gitignore b/test/validation/api/lock/.gitignore similarity index 100% rename from test/common_plat/validation/api/lock/.gitignore rename to test/validation/api/lock/.gitignore diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am similarity index 100% rename from test/common_plat/validation/api/lock/Makefile.am rename to test/validation/api/lock/Makefile.am diff --git a/test/common_plat/validation/api/lock/lock.c b/test/validation/api/lock/lock.c similarity index 100% rename from test/common_plat/validation/api/lock/lock.c rename to test/validation/api/lock/lock.c diff --git a/test/common_plat/validation/api/lock/lock.h b/test/validation/api/lock/lock.h similarity index 100% rename from test/common_plat/validation/api/lock/lock.h rename to test/validation/api/lock/lock.h diff --git a/test/common_plat/validation/api/lock/lock_main.c b/test/validation/api/lock/lock_main.c similarity index 100% rename from test/common_plat/validation/api/lock/lock_main.c rename to test/validation/api/lock/lock_main.c diff --git a/test/common_plat/validation/api/packet/.gitignore b/test/validation/api/packet/.gitignore similarity index 100% rename from test/common_plat/validation/api/packet/.gitignore rename to test/validation/api/packet/.gitignore diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am similarity index 100% rename from test/common_plat/validation/api/packet/Makefile.am rename to test/validation/api/packet/Makefile.am diff --git a/test/common_plat/validation/api/packet/packet.c b/test/validation/api/packet/packet.c similarity index 100% rename from test/common_plat/validation/api/packet/packet.c rename to test/validation/api/packet/packet.c diff --git a/test/common_plat/validation/api/packet/packet.h b/test/validation/api/packet/packet.h similarity index 100% rename from test/common_plat/validation/api/packet/packet.h rename to test/validation/api/packet/packet.h diff --git a/test/common_plat/validation/api/packet/packet_main.c b/test/validation/api/packet/packet_main.c similarity index 100% rename from test/common_plat/validation/api/packet/packet_main.c rename to test/validation/api/packet/packet_main.c diff --git a/test/common_plat/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore similarity index 100% rename from test/common_plat/validation/api/pktio/.gitignore rename to test/validation/api/pktio/.gitignore diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am similarity index 100% rename from test/common_plat/validation/api/pktio/Makefile.am rename to test/validation/api/pktio/Makefile.am diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c similarity index 100% rename from test/common_plat/validation/api/pktio/parser.c rename to test/validation/api/pktio/parser.c diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h similarity index 100% rename from test/common_plat/validation/api/pktio/parser.h rename to test/validation/api/pktio/parser.h diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c similarity index 100% rename from test/common_plat/validation/api/pktio/pktio.c rename to test/validation/api/pktio/pktio.c diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h similarity index 100% rename from test/common_plat/validation/api/pktio/pktio.h rename to test/validation/api/pktio/pktio.h diff --git a/test/common_plat/validation/api/pktio/pktio_main.c b/test/validation/api/pktio/pktio_main.c similarity index 100% rename from test/common_plat/validation/api/pktio/pktio_main.c rename to test/validation/api/pktio/pktio_main.c diff --git a/test/common_plat/validation/api/pool/.gitignore b/test/validation/api/pool/.gitignore similarity index 100% rename from test/common_plat/validation/api/pool/.gitignore rename to test/validation/api/pool/.gitignore diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am similarity index 100% rename from test/common_plat/validation/api/pool/Makefile.am rename to test/validation/api/pool/Makefile.am diff --git a/test/common_plat/validation/api/pool/pool.c b/test/validation/api/pool/pool.c similarity index 100% rename from test/common_plat/validation/api/pool/pool.c rename to test/validation/api/pool/pool.c diff --git a/test/common_plat/validation/api/pool/pool.h b/test/validation/api/pool/pool.h similarity index 100% rename from test/common_plat/validation/api/pool/pool.h rename to test/validation/api/pool/pool.h diff --git a/test/common_plat/validation/api/pool/pool_main.c b/test/validation/api/pool/pool_main.c similarity index 100% rename from test/common_plat/validation/api/pool/pool_main.c rename to test/validation/api/pool/pool_main.c diff --git a/test/common_plat/validation/api/queue/.gitignore b/test/validation/api/queue/.gitignore similarity index 100% rename from test/common_plat/validation/api/queue/.gitignore rename to test/validation/api/queue/.gitignore diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am similarity index 100% rename from test/common_plat/validation/api/queue/Makefile.am rename to test/validation/api/queue/Makefile.am diff --git a/test/common_plat/validation/api/queue/queue.c b/test/validation/api/queue/queue.c similarity index 100% rename from test/common_plat/validation/api/queue/queue.c rename to test/validation/api/queue/queue.c diff --git a/test/common_plat/validation/api/queue/queue.h b/test/validation/api/queue/queue.h similarity index 100% rename from test/common_plat/validation/api/queue/queue.h rename to test/validation/api/queue/queue.h diff --git a/test/common_plat/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c similarity index 100% rename from test/common_plat/validation/api/queue/queue_main.c rename to test/validation/api/queue/queue_main.c diff --git a/test/common_plat/validation/api/random/.gitignore b/test/validation/api/random/.gitignore similarity index 100% rename from test/common_plat/validation/api/random/.gitignore rename to test/validation/api/random/.gitignore diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am similarity index 100% rename from test/common_plat/validation/api/random/Makefile.am rename to test/validation/api/random/Makefile.am diff --git a/test/common_plat/validation/api/random/random.c b/test/validation/api/random/random.c similarity index 100% rename from test/common_plat/validation/api/random/random.c rename to test/validation/api/random/random.c diff --git a/test/common_plat/validation/api/random/random.h b/test/validation/api/random/random.h similarity index 100% rename from test/common_plat/validation/api/random/random.h rename to test/validation/api/random/random.h diff --git a/test/common_plat/validation/api/random/random_main.c b/test/validation/api/random/random_main.c similarity index 100% rename from test/common_plat/validation/api/random/random_main.c rename to test/validation/api/random/random_main.c diff --git a/test/common_plat/validation/api/scheduler/.gitignore b/test/validation/api/scheduler/.gitignore similarity index 100% rename from test/common_plat/validation/api/scheduler/.gitignore rename to test/validation/api/scheduler/.gitignore diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am similarity index 100% rename from test/common_plat/validation/api/scheduler/Makefile.am rename to test/validation/api/scheduler/Makefile.am diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler.c rename to test/validation/api/scheduler/scheduler.c diff --git a/test/common_plat/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler.h rename to test/validation/api/scheduler/scheduler.h diff --git a/test/common_plat/validation/api/scheduler/scheduler_main.c b/test/validation/api/scheduler/scheduler_main.c similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler_main.c rename to test/validation/api/scheduler/scheduler_main.c diff --git a/test/common_plat/validation/api/shmem/.gitignore b/test/validation/api/shmem/.gitignore similarity index 100% rename from test/common_plat/validation/api/shmem/.gitignore rename to test/validation/api/shmem/.gitignore diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am similarity index 100% rename from test/common_plat/validation/api/shmem/Makefile.am rename to test/validation/api/shmem/Makefile.am diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c similarity index 100% rename from test/common_plat/validation/api/shmem/shmem.c rename to test/validation/api/shmem/shmem.c diff --git a/test/common_plat/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h similarity index 100% rename from test/common_plat/validation/api/shmem/shmem.h rename to test/validation/api/shmem/shmem.h diff --git a/test/common_plat/validation/api/shmem/shmem_main.c b/test/validation/api/shmem/shmem_main.c similarity index 100% rename from test/common_plat/validation/api/shmem/shmem_main.c rename to test/validation/api/shmem/shmem_main.c diff --git a/test/common_plat/validation/api/std_clib/.gitignore b/test/validation/api/std_clib/.gitignore similarity index 100% rename from test/common_plat/validation/api/std_clib/.gitignore rename to test/validation/api/std_clib/.gitignore diff --git a/test/common_plat/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am similarity index 100% rename from test/common_plat/validation/api/std_clib/Makefile.am rename to test/validation/api/std_clib/Makefile.am diff --git a/test/common_plat/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib.c rename to test/validation/api/std_clib/std_clib.c diff --git a/test/common_plat/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib.h rename to test/validation/api/std_clib/std_clib.h diff --git a/test/common_plat/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib_main.c rename to test/validation/api/std_clib/std_clib_main.c diff --git a/test/common_plat/validation/api/system/.gitignore b/test/validation/api/system/.gitignore similarity index 100% rename from test/common_plat/validation/api/system/.gitignore rename to test/validation/api/system/.gitignore diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am similarity index 100% rename from test/common_plat/validation/api/system/Makefile.am rename to test/validation/api/system/Makefile.am diff --git a/test/common_plat/validation/api/system/system.c b/test/validation/api/system/system.c similarity index 100% rename from test/common_plat/validation/api/system/system.c rename to test/validation/api/system/system.c diff --git a/test/common_plat/validation/api/system/system.h b/test/validation/api/system/system.h similarity index 100% rename from test/common_plat/validation/api/system/system.h rename to test/validation/api/system/system.h diff --git a/test/common_plat/validation/api/system/system_main.c b/test/validation/api/system/system_main.c similarity index 100% rename from test/common_plat/validation/api/system/system_main.c rename to test/validation/api/system/system_main.c diff --git a/test/common_plat/validation/api/thread/.gitignore b/test/validation/api/thread/.gitignore similarity index 100% rename from test/common_plat/validation/api/thread/.gitignore rename to test/validation/api/thread/.gitignore diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am similarity index 100% rename from test/common_plat/validation/api/thread/Makefile.am rename to test/validation/api/thread/Makefile.am diff --git a/test/common_plat/validation/api/thread/thread.c b/test/validation/api/thread/thread.c similarity index 100% rename from test/common_plat/validation/api/thread/thread.c rename to test/validation/api/thread/thread.c diff --git a/test/common_plat/validation/api/thread/thread.h b/test/validation/api/thread/thread.h similarity index 100% rename from test/common_plat/validation/api/thread/thread.h rename to test/validation/api/thread/thread.h diff --git a/test/common_plat/validation/api/thread/thread_main.c b/test/validation/api/thread/thread_main.c similarity index 100% rename from test/common_plat/validation/api/thread/thread_main.c rename to test/validation/api/thread/thread_main.c diff --git a/test/common_plat/validation/api/time/.gitignore b/test/validation/api/time/.gitignore similarity index 100% rename from test/common_plat/validation/api/time/.gitignore rename to test/validation/api/time/.gitignore diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am similarity index 100% rename from test/common_plat/validation/api/time/Makefile.am rename to test/validation/api/time/Makefile.am diff --git a/test/common_plat/validation/api/time/time.c b/test/validation/api/time/time.c similarity index 100% rename from test/common_plat/validation/api/time/time.c rename to test/validation/api/time/time.c diff --git a/test/common_plat/validation/api/time/time.sh b/test/validation/api/time/time.sh similarity index 93% rename from test/common_plat/validation/api/time/time.sh rename to test/validation/api/time/time.sh index 02bf75a76..ecedddb76 100755 --- a/test/common_plat/validation/api/time/time.sh +++ b/test/validation/api/time/time.sh @@ -13,7 +13,7 @@ # -in the current directory. # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/time:$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/time:$PATH +PATH=$(dirname $0)/../../../../validation/api/time:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/common_plat/validation/api/time/time_main.c b/test/validation/api/time/time_main.c similarity index 100% rename from test/common_plat/validation/api/time/time_main.c rename to test/validation/api/time/time_main.c diff --git a/test/common_plat/validation/api/time/time_test.h b/test/validation/api/time/time_test.h similarity index 100% rename from test/common_plat/validation/api/time/time_test.h rename to test/validation/api/time/time_test.h diff --git a/test/common_plat/validation/api/timer/.gitignore b/test/validation/api/timer/.gitignore similarity index 100% rename from test/common_plat/validation/api/timer/.gitignore rename to test/validation/api/timer/.gitignore diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am similarity index 100% rename from test/common_plat/validation/api/timer/Makefile.am rename to test/validation/api/timer/Makefile.am diff --git a/test/common_plat/validation/api/timer/timer.c b/test/validation/api/timer/timer.c similarity index 100% rename from test/common_plat/validation/api/timer/timer.c rename to test/validation/api/timer/timer.c diff --git a/test/common_plat/validation/api/timer/timer.h b/test/validation/api/timer/timer.h similarity index 100% rename from test/common_plat/validation/api/timer/timer.h rename to test/validation/api/timer/timer.h diff --git a/test/common_plat/validation/api/timer/timer_main.c b/test/validation/api/timer/timer_main.c similarity index 100% rename from test/common_plat/validation/api/timer/timer_main.c rename to test/validation/api/timer/timer_main.c diff --git a/test/common_plat/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/.gitignore rename to test/validation/api/traffic_mngr/.gitignore diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/Makefile.am rename to test/validation/api/traffic_mngr/Makefile.am diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.c rename to test/validation/api/traffic_mngr/traffic_mngr.c diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h b/test/validation/api/traffic_mngr/traffic_mngr.h similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.h rename to test/validation/api/traffic_mngr/traffic_mngr.h diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh similarity index 93% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh rename to test/validation/api/traffic_mngr/traffic_mngr.sh index 4db7ea384..c4e2d2976 100755 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr/traffic_mngr.sh @@ -13,7 +13,7 @@ # -in the current directory. # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/traffic_mngr:$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/traffic_mngr:$PATH +PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c b/test/validation/api/traffic_mngr/traffic_mngr_main.c similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c rename to test/validation/api/traffic_mngr/traffic_mngr_main.c From patchwork Fri Oct 6 19: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: 115125 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1715982edb; Fri, 6 Oct 2017 12:20:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QALxhHHUcQwNgDsUzCcmpF2OZtfllXQ7b7z75Qql34XDG9/ihs+2cpgYYVE2YGCuNHO+kg6 X-Received: by 10.55.19.228 with SMTP id 97mr35042783qkt.271.1507317639871; Fri, 06 Oct 2017 12:20:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317639; cv=none; d=google.com; s=arc-20160816; b=S3MeMV3YfIlkIu9qJT7CQuFQSssC0vgL3xdgMCMLIxtv+JRncH1gbRu+0gDPStoYzl QAq7or5vHeBugpy/goHYsX62I6pOwQe7ROJKdibmkBrVN8gtMhwnF82mbmPr7gEoun9H pPucgh1jIsg0FfptQfRM/7bFnMJgZN3MJVArMtfB9rKjeXR0Pso8+5gEplj4ItMjDF9h lWbCH36l5C+/9fvMz2S7Qaz9UcxSUHJxULxeBbpyWZ1/d57PQBANCP/7tybMu639fwes bjjYT/iiXeCaYFDTDyyNldhS9kDAILAmNZM+ZJcRbQg/Uq7TjaGTnriQolEVRVbC3q44 S3og== 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=iteK1h1jtmjSBOML4C994X+BZnLKHXMJ4wujdYdWfEw=; b=p9wCchaiJ1+GDcy1UkWPjesdV0fjne5hnh4uypuMi/PLNdyQpN7A3mJ6RhoO2s5TWu Nn46/5eAzhzRAXcWvUPTzAh5b0FvotrmqQQ0vqd1Mnd82ktedn4MqzYc39Hy/89O5O51 DxCiJ9SGxAeC7Kq8RJA1aYwE5k1Lx8OmSJDCp7TyzVQpzRIpKQ7u7cz7fuotDG7grcMg I8hlhvnUGXZB6wzdUgKH7+IGdDctXSapfSNYw8fKLEsX9n9n71KkEjhEUXnV+RCBr8V6 MeyhpjSauj11qTvf2++rv5hTMryLKU3ewgYJZso6Uop+54n1GzXJ7ZdkreIlop+ZEDWG orlw== 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 n54si1812797qtb.48.2017.10.06.12.20.39; Fri, 06 Oct 2017 12:20:39 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 8798865BFE; Fri, 6 Oct 2017 19:20:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 54C5165C0D; Fri, 6 Oct 2017 19:03: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 6625765BD3; Fri, 6 Oct 2017 19:03:25 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 7938665BD1 for ; Fri, 6 Oct 2017 19:00:55 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 8070145A56 for ; Fri, 6 Oct 2017 22:00:54 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XYq4xK4Aze-0sr02oDI; Fri, 06 Oct 2017 22:00:54 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0stGI72o; Fri, 06 Oct 2017 22:00:54 +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: Fri, 6 Oct 2017 22:00:08 +0300 Message-Id: <1507316415-2144-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 13/20] linux-gen: move libodp-linux.pc.in to platform directory 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ configure.ac | 1 - platform/Makefile.inc | 4 +--- {pkgconfig => platform/linux-generic}/libodp-linux.pc.in | 0 platform/linux-generic/m4/configure.m4 | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) rename {pkgconfig => platform/linux-generic}/libodp-linux.pc.in (100%) diff --git a/configure.ac b/configure.ac index 2b075e917..600f52bc9 100644 --- a/configure.ac +++ b/configure.ac @@ -353,7 +353,6 @@ CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" AC_CONFIG_FILES([Makefile - pkgconfig/libodp-linux.pc pkgconfig/libodphelper.pc ]) diff --git a/platform/Makefile.inc b/platform/Makefile.inc index f3161abd4..b1eeb361a 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -1,9 +1,7 @@ LIB = $(top_builddir)/lib pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc - -.PHONY: pkgconfig/libodp-linux.pc +pkgconfig_DATA = libodp-linux.pc VPATH = $(srcdir) $(builddir) lib_LTLIBRARIES = $(LIB)/libodp-linux.la diff --git a/pkgconfig/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in similarity index 100% rename from pkgconfig/libodp-linux.pc.in rename to platform/linux-generic/libodp-linux.pc.in diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 1a09102e7..7dc83bf87 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -12,6 +12,7 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4]) m4_include([platform/linux-generic/m4/performance.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile + platform/linux-generic/libodp-linux.pc platform/linux-generic/include/odp/api/plat/static_inline.h platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile From patchwork Fri Oct 6 19: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: 115126 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1716680edb; Fri, 6 Oct 2017 12:21:30 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBjj2oNG92se6hiTVd1wwn26BRBAFGGLNhi7P57k2K4tjRmvwjLT39ya7voHo0fCQPmGnul X-Received: by 10.36.218.193 with SMTP id z184mr3908936itg.137.1507317690645; Fri, 06 Oct 2017 12:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317690; cv=none; d=google.com; s=arc-20160816; b=AG5OkAHeVtRp/xQfmbiWzbUj/6WwqKAhFMk7+jwJT62QSoMMGSNWnLURk2a4Fjotiy 3JQmqopgi5I6HSSzh5pYmx4fY+Q8Zo/pnsemB4+lw3br8nErq1WUVMGr6DMVmo0S9L47 pv8a5n50IXnugntZv7A0qHV6jqJGscOkqjH8mtoSjHwLExjzDnwG5kX+UZHVkXVp1mLB XzvCQDTBuyozAM/8bXdpWWy8NX0FDpwimMP7cGeczFMYdB1dXdJNNQSKpuG5+/wEjoTP ZaILL1KtUqwnCJw1biGLWtGdivYiFja5Alf/4YrCi/WAWhkIzLxbRxWY0yEO+VqXbl+Y qT1Q== 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=AIKcIzNxU7mMtDUn11LN3or3euVRvZFsiXJoDN4JEPk=; b=k/tE6hEQgwrsUk3KFwUGETM9gyQiPvPVO9ndsy21KlIyjEyM6IFi8j8w5DCpIRy+Fm 74GM9tRHnmEKgjIeSVgt0tDSldWepXliDDaqKAYi8hsa9lT3wzbeYa8ZNr5hHYXLSd9d +PiKjlmrWWLdreV6Rv2HcourI/hc6DgNRN9HDdtIulcXC+tOsjeMp8mLtGXQjpbj0c5k 9F+hgWk1IVrkKvl4PbFnI++/7XdQv0iLA0GW2iT5ZUTYtPoIFGZcjcDDIXG8XNQK4LH6 zF83YujHmMF0GsJ7Sp5usACNh0lTxPL8VeJJIV9mpJadsU/xhC6+nZhtlOTMljodru4S LxTg== 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 x1si1822249itd.33.2017.10.06.12.21.30; Fri, 06 Oct 2017 12:21:30 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2E1BE65C00; Fri, 6 Oct 2017 19:21:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 A8D2C65C10; Fri, 6 Oct 2017 19:03:42 +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 BEE0265C08; Fri, 6 Oct 2017 19:03:27 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 1A02F6486B for ; Fri, 6 Oct 2017 19:00:56 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 167462A23A3C for ; Fri, 6 Oct 2017 22:00:55 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id vCwoXxd3uQ-0tTSkPvo; Fri, 06 Oct 2017 22:00:55 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0stepD1Y; Fri, 06 Oct 2017 22:00:54 +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: Fri, 6 Oct 2017 22:00:09 +0300 Message-Id: <1507316415-2144-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 14/20] helper: move libodphelper.pc.in to helper directory 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 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ configure.ac | 4 +--- helper/Makefile.am | 2 +- {pkgconfig => helper}/libodphelper.pc.in | 0 helper/m4/configure.m4 | 3 ++- 4 files changed, 4 insertions(+), 5 deletions(-) rename {pkgconfig => helper}/libodphelper.pc.in (100%) diff --git a/configure.ac b/configure.ac index 600f52bc9..87362bd41 100644 --- a/configure.ac +++ b/configure.ac @@ -352,9 +352,7 @@ esac CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" -AC_CONFIG_FILES([Makefile - pkgconfig/libodphelper.pc - ]) +AC_CONFIG_FILES([Makefile]) ########################################################################## # distribute the changed variables among the Makefiles diff --git a/helper/Makefile.am b/helper/Makefile.am index bf75b467e..c668386d9 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,5 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc +pkgconfig_DATA = libodphelper.pc LIB = $(top_builddir)/lib AM_CPPFLAGS = -I$(srcdir)/include diff --git a/pkgconfig/libodphelper.pc.in b/helper/libodphelper.pc.in similarity index 100% rename from pkgconfig/libodphelper.pc.in rename to helper/libodphelper.pc.in diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 2e2943d14..3a867e8cb 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -19,4 +19,5 @@ AC_ARG_ENABLE([helper-linux], fi]) AC_CONFIG_FILES([helper/Makefile - helper/test/Makefile]) + helper/libodphelper.pc + helper/test/Makefile]) From patchwork Fri Oct 6 19:00:10 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: 115127 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1717382edb; Fri, 6 Oct 2017 12:22:14 -0700 (PDT) X-Google-Smtp-Source: AOwi7QABxARvnaIuEJk3CsbFIkc2rWUaMdz99I9NLtyITiaAbuA5+F+B3y6Se1YOrCQ96V1Kp44D X-Received: by 10.36.84.82 with SMTP id t79mr4025634ita.98.1507317734116; Fri, 06 Oct 2017 12:22:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317734; cv=none; d=google.com; s=arc-20160816; b=U/r44JYucpv7Es8lJ/F6UnmePcq+WKs93vjmhZgapTRY3aHA74r/UBrkSUzqsqFYMn /dm2De4Q/3n8wgoT8yAzB8xgRCL7GehbFlkcdmB6AxVd3aGwlSZWQod5kxeG0Eerpk6B 4zV9AyM2nwingwa5UYdu38HjXJ8NIAcS06Aws+PWUMCPelwaU6aTxvef2pdoJdwX5nqQ Bljcal91h8x5BTdltt/svTXMpV6faXtts9uRoBcSzDOMzpZQe/LXKBwRhTdxVieYicHf +qUMrV6j5J4PUkK2kdy9Xjv7uPEpyolC6cq7ZlqXIz4N3dR7NIioXsqtn2NifCR+Q9tq FiMg== 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=a9Ge/53SHqKCmD/Y8McrkRTdgT6d4VDDzNEmK7oOI7Y=; b=VumhaT8nr4rlmdFB49HkSqr9Rid/8B8IZYTKEdoTJrO90DOzGhqk7P+cQzP3ff6JD/ s1EAoS6fqoF2Umk9NV05JYpon/+lPNfC5r7BZmM13W2jTl3+nFlOZDSqokdrA49ZWfA7 2Ac9RCZhqQHz4QbOev80Irf2GdB90Fd5QfSXujqQ7xeaqT3KPB8QqoB4vqTAz+YiQild bFI+J6JoTeRbqtVR1DAXPXqA7uz5HE8f4Da0FaZ8Z6JXnbn4HH1r4wKHoLG+8h+fDIQZ 0QcprAfdj7USaqtNSP8kmRAKQjPkn2rWAIARFeep8Jjm7xRKFp9FSqQ/zO8q/ogjVDxo Z3mg== 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 f25si1618742ioj.105.2017.10.06.12.22.13; Fri, 06 Oct 2017 12:22:14 -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 8ED7865BE4; Fri, 6 Oct 2017 19:22:13 +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 F238F65BDD; Fri, 6 Oct 2017 19:03:51 +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 CD8BB65BD4; Fri, 6 Oct 2017 19:03:28 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id B8C7565BD4 for ; Fri, 6 Oct 2017 19:01:02 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward102j.mail.yandex.net (Yandex) with ESMTP id C1E325601AC7 for ; Fri, 6 Oct 2017 22:01:01 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id J37qGNlKzx-0tniBXNQ; Fri, 06 Oct 2017 22:00:55 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0tted1U8; Fri, 06 Oct 2017 22:00:55 +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: Fri, 6 Oct 2017 22:00:10 +0300 Message-Id: <1507316415-2144-16-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 15/20] build: move handling of include files to include dir 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 There is little point in handling common headers in platform-specific dir. Move respective definitions to include/Makefie.am. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ Makefile.am | 1 + configure.ac | 7 +-- include/Makefile.am | 87 ++++++++++++++++++++++++++++++++++++++ platform/Makefile.inc | 67 ----------------------------- platform/linux-generic/Makefile.am | 14 ------ 5 files changed, 92 insertions(+), 84 deletions(-) create mode 100644 include/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0c28eb0c7..af0d2f51c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ #@with_platform@ works alone in subdir but not as part of a path??? SUBDIRS = \ + include \ test_common \ helper \ @platform_with_platform@ \ diff --git a/configure.ac b/configure.ac index 87362bd41..3209ade8b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,9 +16,6 @@ ODP_VERSION_API_MAJOR=odpapi_major_version AC_SUBST(ODP_VERSION_API_MAJOR) ODP_VERSION_API_MINOR=odpapi_minor_version AC_SUBST(ODP_VERSION_API_MINOR) -AC_CONFIG_FILES([include/odp/api/spec/version.h - include/odp/api/spec/deprecated.h]) - AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) @@ -353,6 +350,10 @@ CFLAGS="$CFLAGS $ODP_CFLAGS" CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([include/Makefile + include/odp/api/spec/version.h + include/odp/api/spec/deprecated.h]) + ########################################################################## # distribute the changed variables among the Makefiles diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..236c4c375 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,87 @@ +include_HEADERS = \ + odp.h \ + odp_api.h + +odpapispecincludedir= $(includedir)/odp/api/spec +odpapispecinclude_HEADERS = \ + odp/api/spec/align.h \ + odp/api/spec/atomic.h \ + odp/api/spec/barrier.h \ + odp/api/spec/buffer.h \ + odp/api/spec/byteorder.h \ + odp/api/spec/classification.h \ + odp/api/spec/compiler.h \ + odp/api/spec/cpu.h \ + odp/api/spec/cpumask.h \ + odp/api/spec/crypto.h \ + odp/api/spec/debug.h \ + odp/api/spec/errno.h \ + odp/api/spec/event.h \ + odp/api/spec/hash.h \ + odp/api/spec/hints.h \ + odp/api/spec/init.h \ + odp/api/spec/packet.h \ + odp/api/spec/packet_flags.h \ + odp/api/spec/packet_io.h \ + odp/api/spec/packet_io_stats.h \ + odp/api/spec/pool.h \ + odp/api/spec/queue.h \ + odp/api/spec/random.h \ + odp/api/spec/rwlock.h \ + odp/api/spec/rwlock_recursive.h \ + odp/api/spec/schedule.h \ + odp/api/spec/schedule_types.h \ + odp/api/spec/shared_memory.h \ + odp/api/spec/spinlock.h \ + odp/api/spec/spinlock_recursive.h \ + odp/api/spec/std_clib.h \ + odp/api/spec/std_types.h \ + odp/api/spec/sync.h \ + odp/api/spec/system_info.h \ + odp/api/spec/thread.h \ + odp/api/spec/thrmask.h \ + odp/api/spec/ticketlock.h \ + odp/api/spec/time.h \ + odp/api/spec/timer.h \ + odp/api/spec/traffic_mngr.h + +nodist_odpapispecinclude_HEADERS = \ + odp/api/spec/deprecated.h \ + odp/api/spec/version.h + +odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi +odpapiabidefaultinclude_HEADERS = \ + odp/arch/default/api/abi/buffer.h \ + odp/arch/default/api/abi/classification.h \ + odp/arch/default/api/abi/crypto.h \ + odp/arch/default/api/abi/event.h \ + odp/arch/default/api/abi/packet.h \ + odp/arch/default/api/abi/pool.h \ + odp/arch/default/api/abi/queue.h \ + odp/arch/default/api/abi/shared_memory.h + +odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +odpapiabiarchinclude_HEADERS = \ + odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ + odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h + +# Create symlink for ABI header files. Application does not need to use the arch +# specific include path for installed files. +install-data-hook: + if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ + : ; \ + else \ + $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ + $(DESTDIR)$(prefix)/include/odp/api/abi; \ + fi + +# Rerefence all nodist_*_HEADERS here +.PHONY: $(nodist_odpapispecinclude_HEADERS) +$(nodist_odpapispecinclude_HEADERS): + $(MAKE) -C $(top_builddir) $(subdir)/$@ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index b1eeb361a..0086db779 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -12,70 +12,3 @@ AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) AM_CFLAGS += @PTHREAD_CFLAGS@ - -odpapispecincludedir= $(includedir)/odp/api/spec -odpapispecinclude_HEADERS = \ - $(top_srcdir)/include/odp/api/spec/align.h \ - $(top_srcdir)/include/odp/api/spec/atomic.h \ - $(top_srcdir)/include/odp/api/spec/barrier.h \ - $(top_srcdir)/include/odp/api/spec/buffer.h \ - $(top_srcdir)/include/odp/api/spec/byteorder.h \ - $(top_srcdir)/include/odp/api/spec/classification.h \ - $(top_srcdir)/include/odp/api/spec/compiler.h \ - $(top_srcdir)/include/odp/api/spec/cpu.h \ - $(top_srcdir)/include/odp/api/spec/cpumask.h \ - $(top_srcdir)/include/odp/api/spec/crypto.h \ - $(top_srcdir)/include/odp/api/spec/debug.h \ - $(top_srcdir)/include/odp/api/spec/errno.h \ - $(top_srcdir)/include/odp/api/spec/event.h \ - $(top_srcdir)/include/odp/api/spec/hash.h \ - $(top_srcdir)/include/odp/api/spec/hints.h \ - $(top_srcdir)/include/odp/api/spec/init.h \ - $(top_srcdir)/include/odp/api/spec/packet.h \ - $(top_srcdir)/include/odp/api/spec/packet_flags.h \ - $(top_srcdir)/include/odp/api/spec/packet_io.h \ - $(top_srcdir)/include/odp/api/spec/packet_io_stats.h \ - $(top_srcdir)/include/odp/api/spec/pool.h \ - $(top_srcdir)/include/odp/api/spec/queue.h \ - $(top_srcdir)/include/odp/api/spec/random.h \ - $(top_srcdir)/include/odp/api/spec/rwlock.h \ - $(top_srcdir)/include/odp/api/spec/rwlock_recursive.h \ - $(top_srcdir)/include/odp/api/spec/schedule.h \ - $(top_srcdir)/include/odp/api/spec/schedule_types.h \ - $(top_srcdir)/include/odp/api/spec/shared_memory.h \ - $(top_srcdir)/include/odp/api/spec/spinlock.h \ - $(top_srcdir)/include/odp/api/spec/spinlock_recursive.h \ - $(top_srcdir)/include/odp/api/spec/std_clib.h \ - $(top_srcdir)/include/odp/api/spec/std_types.h \ - $(top_srcdir)/include/odp/api/spec/sync.h \ - $(top_srcdir)/include/odp/api/spec/system_info.h \ - $(top_srcdir)/include/odp/api/spec/thread.h \ - $(top_srcdir)/include/odp/api/spec/thrmask.h \ - $(top_srcdir)/include/odp/api/spec/ticketlock.h \ - $(top_srcdir)/include/odp/api/spec/time.h \ - $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_builddir)/include/odp/api/spec/deprecated.h \ - $(top_builddir)/include/odp/api/spec/version.h - -odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi -odpapiabidefaultinclude_HEADERS = \ - $(top_srcdir)/include/odp/arch/default/api/abi/buffer.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/classification.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/crypto.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/event.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/pool.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/queue.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/shared_memory.h - -odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi -odpapiabiarchinclude_HEADERS = \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7d79ccfc4..5a8b39a8b 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -16,10 +16,6 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS) -include_HEADERS = \ - $(top_srcdir)/include/odp.h \ - $(top_srcdir)/include/odp_api.h - odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ $(srcdir)/include/odp/visibility_begin.h \ @@ -278,13 +274,3 @@ __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) if HAVE_PCAP __LIB__libodp_linux_la_LIBADD += $(PCAP_LIBS) endif - -# Create symlink for ABI header files. Application does not need to use the arch -# specific include path for installed files. -install-data-hook: - if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ - : ; \ - else \ - $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(DESTDIR)$(prefix)/include/odp/api/abi; \ - fi From patchwork Fri Oct 6 19:00:11 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: 115128 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1718192edb; Fri, 6 Oct 2017 12:23:14 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDo9FSJxHIFe5WtxF8YPwONovpWj1sXl5Avozw4vPs9BD4Cg0tcvTAftBaIIr4Vu1ENLre6 X-Received: by 10.36.140.77 with SMTP id j74mr3552518itd.95.1507317794215; Fri, 06 Oct 2017 12:23:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317794; cv=none; d=google.com; s=arc-20160816; b=JwYG8XNkUzzYNIiPIitiTkup1IwFS746E9HhTpNnyCNZjtITFU3JyRC43IPZsPiwuh DT1nDFWfWfu7+P5ezLAkPPE7git5EkfG5QF5p4Z4Ytb1A2lIiFQS5Ezq+0WFBX7FINZw xDvThtSJchdilnDV+sgkC7Ykh+VqHAtpr89c84l/KlyCqNSSgUmXQzy8YO2kyn9KTXBb NFwWqIO1ZnH/7cGLdV1Pt6erTm46kbjENTy+6F250hKMVjPsn5SkCLmlT22fq/VgvvNF pmhrRF9MQXvZi434e5X2EVIrQACKzL+0pcB5+gnOM+fyp0O2hbmZNOToqn4yoqx97HAQ 861g== 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=mAG1FZqnsh0+1lOSmiY16TICpS34M/eO8S8LGX3S4Ao=; b=JEG8cEXu4bWCQvXRH04bzsio+zfl3XFtXKp0aOzHk6LJnTeK5Vq+265I2wtC8mECac HSusjtDmslZT/QWilB7NyGLNXJ849zCNP7+BjIIQ1bKA8tz4xOu/lDukWIzxtcVWZAj6 wxdE5O9gVMHRgRtZCkNnNODU0tk+gU1MDkjc5zzN98/j+WXPN35AXS4+8RNyOXmS7jsP dJfSAdhN8BbA0hDQiPTKOK4gHf0p0H+5R9c0aVEUo3gWO7W626yUcPYLFYhAaBwqJIce TKVGCWm2rvPMjTyQ+RaB08T60wrx1ebsQEi0IIYaGzv0xwykh4uMRGnq8w7tZyXV6R1e OvZg== 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 h74si1567211ioi.210.2017.10.06.12.23.13; Fri, 06 Oct 2017 12:23:14 -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 B643664A61; Fri, 6 Oct 2017 19:23:13 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 4582D65907; Fri, 6 Oct 2017 19:03:56 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 841CD65C10; Fri, 6 Oct 2017 19:03:34 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id AC56460130 for ; Fri, 6 Oct 2017 19:01:26 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 5D8F05A02536 for ; Fri, 6 Oct 2017 22:01:25 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3FvSZh2s7w-12S8iLoq; Fri, 06 Oct 2017 22:01:02 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-11tSwVkq; Fri, 06 Oct 2017 22:01:01 +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: Fri, 6 Oct 2017 22:00:11 +0300 Message-Id: <1507316415-2144-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 16/20] include: include all ABI files into distribution 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 Due to the way Automake interacts with autoconf substitutions, ODP tarballs included ABI headers only for the current directory. Include all ABI headers into tarball. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ configure.ac | 2 ++ include/Makefile.am | 73 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 3209ade8b..e5bbccb31 100644 --- a/configure.ac +++ b/configure.ac @@ -219,6 +219,8 @@ AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) +AM_CONDITIONAL([ARCH_IS_X86_32], [test "x${ARCH_ABI}" = "xx86_32-linux"]) +AM_CONDITIONAL([ARCH_IS_X86_64], [test "x${ARCH_ABI}" = "xx86_64-linux"]) ########################################################################## # Setup doxygen documentation diff --git a/include/Makefile.am b/include/Makefile.am index 236c4c375..a3a7e1658 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -61,15 +61,72 @@ odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/shared_memory.h odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ - odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h + odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/crypto.h \ + odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/pool.h \ + odp/arch/arm32-linux/odp/api/abi/queue.h \ + odp/arch/arm32-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_AARCH64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/crypto.h \ + odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/pool.h \ + odp/arch/arm64-linux/odp/api/abi/queue.h \ + odp/arch/arm64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_MIPS64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/crypto.h \ + odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/pool.h \ + odp/arch/mips64-linux/odp/api/abi/queue.h \ + odp/arch/mips64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_POWERPC +odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/crypto.h \ + odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/pool.h \ + odp/arch/power64-linux/odp/api/abi/queue.h \ + odp/arch/power64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_X86_32 +odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/crypto.h \ + odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/pool.h \ + odp/arch/x86_32-linux/odp/api/abi/queue.h \ + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_X86_64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/crypto.h \ + odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/pool.h \ + odp/arch/x86_64-linux/odp/api/abi/queue.h \ + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h +endif # Create symlink for ABI header files. Application does not need to use the arch # specific include path for installed files. From patchwork Fri Oct 6 19:00:12 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: 115129 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1719043edb; Fri, 6 Oct 2017 12:24:14 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA5NdfAyNbL5OK6O6dNBVXKYqOufH3f5v1ycsPF6BmbPDWpOYZaEwwTKNmeYP4DuCuVpXoD X-Received: by 10.107.130.226 with SMTP id m95mr3870080ioi.273.1507317854316; Fri, 06 Oct 2017 12:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317854; cv=none; d=google.com; s=arc-20160816; b=GM0DKBTqhoAYTVT81AtRP0N+I5p8IzOEkdZr6mKmi/pW94fsjhwiMVVfYcK3CdsYXK ni7fqDdMjbUWqM9rDOvN5DzF8/h/UQV5AVV9VdE/pjEQ3qndMNIxkrmSNJq3Sg8/DMPu zy+c6Few7dzAF4GbjrKNvKDDzp3ZfD0EBcmHlujc7h4rDsnKOfSS3w1YhCsDng332heh tnP69pFZxBPvxKG1j5VSiqgI58AqA9NdUlcZLLKiVWerZqpP6D9P3b6rZ8sgBaoe72Qu hNvnclsSpUkcf9GNpVaJQ2Z938RMRYbTqMbf3eIawepeU5EhJoVlwak+39nOiXcbmh+H xXAQ== 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=zU8RgqRb86JBH3u8DFdAKPIQcISbnx7Q/O7whRja5m0=; b=cXhBY6aeQPJWro7oy3ibVpnHXqEeWRJsR+PI/q9gH4z7eTwMFsFxtZQD22HeEuHmMg +Tjq8m0w6hqIK4iiUy27oOdSXSoD0uSP0nR2xqgZgV8TRtcd9zAzfYxtI21BzCfym3vP /Fh8fpM4YHWcS11Q1jc10H3X34ldfVsjpx46nn9U43LXu+6fpErrdVPj7pKwb2VJpsqr EC+j3Q1uV//apOlW1tsbUf2F+8xzY/dh9pZkSv7m5IMeGrzD+ENDUSsE1Ve243kYepin RjOq2TmCbcRzltrK9zJdBYaoJj83XgmX+dyNY2w57BUx137uVvlqkkERrOwvU9n2ojAE N+Lw== 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 i85si1527586ioa.253.2017.10.06.12.24.13; Fri, 06 Oct 2017 12:24:14 -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 C18EE60749; Fri, 6 Oct 2017 19:24:13 +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 91B2F65C16; Fri, 6 Oct 2017 19:04:03 +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 DAA2A65BDD; Fri, 6 Oct 2017 19:03:36 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 222F7644E1 for ; Fri, 6 Oct 2017 19:01:28 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 2218D5102D6A for ; Fri, 6 Oct 2017 22:01:27 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rJrWRb9oS3-1RwibkQl; Fri, 06 Oct 2017 22:01:27 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-1PtGQomk; Fri, 06 Oct 2017 22:01: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: Fri, 6 Oct 2017 22:00:12 +0300 Message-Id: <1507316415-2144-18-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 17/20] linux-gen: drop unnecessary srcdir from Makefile.am 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 There is no point in using $(srcdir) when referencing files inside source directory. Just drop that to simplify Makefile.am. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ platform/linux-generic/Makefile.am | 266 ++++++++++++++++++------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 5a8b39a8b..25b6c31f5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -18,144 +18,144 @@ AM_CPPFLAGS += $(NETMAP_CPPFLAGS) odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ - $(srcdir)/include/odp/visibility_begin.h \ - $(srcdir)/include/odp/visibility_end.h + include/odp/visibility_begin.h \ + include/odp/visibility_end.h odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ - $(srcdir)/include/odp/api/align.h \ - $(srcdir)/include/odp/api/atomic.h \ - $(srcdir)/include/odp/api/barrier.h \ - $(srcdir)/include/odp/api/buffer.h \ - $(srcdir)/include/odp/api/byteorder.h \ - $(srcdir)/include/odp/api/classification.h \ - $(srcdir)/include/odp/api/compiler.h \ - $(srcdir)/include/odp/api/cpu.h \ - $(srcdir)/include/odp/api/cpumask.h \ - $(srcdir)/include/odp/api/crypto.h \ - $(srcdir)/include/odp/api/debug.h \ - $(srcdir)/include/odp/api/deprecated.h \ - $(srcdir)/include/odp/api/errno.h \ - $(srcdir)/include/odp/api/event.h \ - $(srcdir)/include/odp/api/hash.h \ - $(srcdir)/include/odp/api/hints.h \ - $(srcdir)/include/odp/api/init.h \ - $(srcdir)/include/odp/api/packet_flags.h \ - $(srcdir)/include/odp/api/packet.h \ - $(srcdir)/include/odp/api/packet_io.h \ - $(srcdir)/include/odp/api/packet_io_stats.h \ - $(srcdir)/include/odp/api/pool.h \ - $(srcdir)/include/odp/api/queue.h \ - $(srcdir)/include/odp/api/random.h \ - $(srcdir)/include/odp/api/rwlock.h \ - $(srcdir)/include/odp/api/rwlock_recursive.h \ - $(srcdir)/include/odp/api/schedule.h \ - $(srcdir)/include/odp/api/schedule_types.h \ - $(srcdir)/include/odp/api/shared_memory.h \ - $(srcdir)/include/odp/api/spinlock.h \ - $(srcdir)/include/odp/api/spinlock_recursive.h \ - $(srcdir)/include/odp/api/std_clib.h \ - $(srcdir)/include/odp/api/std_types.h \ - $(srcdir)/include/odp/api/sync.h \ - $(srcdir)/include/odp/api/system_info.h \ - $(srcdir)/include/odp/api/thread.h \ - $(srcdir)/include/odp/api/thrmask.h \ - $(srcdir)/include/odp/api/ticketlock.h \ - $(srcdir)/include/odp/api/time.h \ - $(srcdir)/include/odp/api/timer.h \ - $(srcdir)/include/odp/api/traffic_mngr.h \ - $(srcdir)/include/odp/api/version.h + include/odp/api/align.h \ + include/odp/api/atomic.h \ + include/odp/api/barrier.h \ + include/odp/api/buffer.h \ + include/odp/api/byteorder.h \ + include/odp/api/classification.h \ + include/odp/api/compiler.h \ + include/odp/api/cpu.h \ + include/odp/api/cpumask.h \ + include/odp/api/crypto.h \ + include/odp/api/debug.h \ + include/odp/api/deprecated.h \ + include/odp/api/errno.h \ + include/odp/api/event.h \ + include/odp/api/hash.h \ + include/odp/api/hints.h \ + include/odp/api/init.h \ + include/odp/api/packet_flags.h \ + include/odp/api/packet.h \ + include/odp/api/packet_io.h \ + include/odp/api/packet_io_stats.h \ + include/odp/api/pool.h \ + include/odp/api/queue.h \ + include/odp/api/random.h \ + include/odp/api/rwlock.h \ + include/odp/api/rwlock_recursive.h \ + include/odp/api/schedule.h \ + include/odp/api/schedule_types.h \ + include/odp/api/shared_memory.h \ + include/odp/api/spinlock.h \ + include/odp/api/spinlock_recursive.h \ + include/odp/api/std_clib.h \ + include/odp/api/std_types.h \ + include/odp/api/sync.h \ + include/odp/api/system_info.h \ + include/odp/api/thread.h \ + include/odp/api/thrmask.h \ + include/odp/api/ticketlock.h \ + include/odp/api/time.h \ + include/odp/api/timer.h \ + include/odp/api/traffic_mngr.h \ + include/odp/api/version.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ $(builddir)/include/odp/api/plat/static_inline.h \ - $(srcdir)/include/odp/api/plat/atomic_inlines.h \ - $(srcdir)/include/odp/api/plat/atomic_types.h \ - $(srcdir)/include/odp/api/plat/barrier_types.h \ - $(srcdir)/include/odp/api/plat/buffer_types.h \ - $(srcdir)/include/odp/api/plat/byteorder_inlines.h \ - $(srcdir)/include/odp/api/plat/byteorder_types.h \ - $(srcdir)/include/odp/api/plat/classification_types.h \ - $(srcdir)/include/odp/api/plat/cpumask_types.h \ - $(srcdir)/include/odp/api/plat/crypto_types.h \ - $(srcdir)/include/odp/api/plat/event_types.h \ - $(srcdir)/include/odp/api/plat/init_types.h \ - $(srcdir)/include/odp/api/plat/packet_flag_inlines.h \ - $(srcdir)/include/odp/api/plat/packet_flag_inlines_api.h \ - $(srcdir)/include/odp/api/plat/packet_inlines.h \ - $(srcdir)/include/odp/api/plat/packet_inlines_api.h \ - $(srcdir)/include/odp/api/plat/packet_types.h \ - $(srcdir)/include/odp/api/plat/packet_io_types.h \ - $(srcdir)/include/odp/api/plat/pool_types.h \ - $(srcdir)/include/odp/api/plat/queue_types.h \ - $(srcdir)/include/odp/api/plat/rwlock_types.h \ - $(srcdir)/include/odp/api/plat/rwlock_recursive_types.h \ - $(srcdir)/include/odp/api/plat/schedule_types.h \ - $(srcdir)/include/odp/api/plat/shared_memory_types.h \ - $(srcdir)/include/odp/api/plat/spinlock_types.h \ - $(srcdir)/include/odp/api/plat/spinlock_recursive_types.h \ - $(srcdir)/include/odp/api/plat/std_clib_inlines.h \ - $(srcdir)/include/odp/api/plat/strong_types.h \ - $(srcdir)/include/odp/api/plat/sync_inlines.h \ - $(srcdir)/include/odp/api/plat/thread_types.h \ - $(srcdir)/include/odp/api/plat/thrmask_types.h \ - $(srcdir)/include/odp/api/plat/ticketlock_inlines.h \ - $(srcdir)/include/odp/api/plat/ticketlock_inlines_api.h \ - $(srcdir)/include/odp/api/plat/ticketlock_types.h \ - $(srcdir)/include/odp/api/plat/time_types.h \ - $(srcdir)/include/odp/api/plat/timer_types.h \ - $(srcdir)/include/odp/api/plat/traffic_mngr_types.h \ - $(srcdir)/include/odp/api/plat/version_types.h + include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/atomic_types.h \ + include/odp/api/plat/barrier_types.h \ + include/odp/api/plat/buffer_types.h \ + include/odp/api/plat/byteorder_inlines.h \ + include/odp/api/plat/byteorder_types.h \ + include/odp/api/plat/classification_types.h \ + include/odp/api/plat/cpumask_types.h \ + include/odp/api/plat/crypto_types.h \ + include/odp/api/plat/event_types.h \ + include/odp/api/plat/init_types.h \ + include/odp/api/plat/packet_flag_inlines.h \ + include/odp/api/plat/packet_flag_inlines_api.h \ + include/odp/api/plat/packet_inlines.h \ + include/odp/api/plat/packet_inlines_api.h \ + include/odp/api/plat/packet_types.h \ + include/odp/api/plat/packet_io_types.h \ + include/odp/api/plat/pool_types.h \ + include/odp/api/plat/queue_types.h \ + include/odp/api/plat/rwlock_types.h \ + include/odp/api/plat/rwlock_recursive_types.h \ + include/odp/api/plat/schedule_types.h \ + include/odp/api/plat/shared_memory_types.h \ + include/odp/api/plat/spinlock_types.h \ + include/odp/api/plat/spinlock_recursive_types.h \ + include/odp/api/plat/std_clib_inlines.h \ + include/odp/api/plat/strong_types.h \ + include/odp/api/plat/sync_inlines.h \ + include/odp/api/plat/thread_types.h \ + include/odp/api/plat/thrmask_types.h \ + include/odp/api/plat/ticketlock_inlines.h \ + include/odp/api/plat/ticketlock_inlines_api.h \ + include/odp/api/plat/ticketlock_types.h \ + include/odp/api/plat/time_types.h \ + include/odp/api/plat/timer_types.h \ + include/odp/api/plat/traffic_mngr_types.h \ + include/odp/api/plat/version_types.h odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ - $(srcdir)/include/odp/drv/compiler.h + include/odp/drv/compiler.h noinst_HEADERS = \ - ${srcdir}/include/_fdserver_internal.h \ - ${srcdir}/include/_ishm_internal.h \ - ${srcdir}/include/_ishmphy_internal.h \ - ${srcdir}/include/odp_align_internal.h \ - ${srcdir}/include/odp_atomic_internal.h \ - ${srcdir}/include/odp_buffer_inlines.h \ - ${srcdir}/include/odp_bitmap_internal.h \ - ${srcdir}/include/odp_buffer_internal.h \ - ${srcdir}/include/odp_classification_datamodel.h \ - ${srcdir}/include/odp_classification_inlines.h \ - ${srcdir}/include/odp_classification_internal.h \ - ${srcdir}/include/odp_config_internal.h \ - ${srcdir}/include/odp_crypto_internal.h \ - ${srcdir}/include/odp_debug_internal.h \ - ${srcdir}/include/odp_errno_define.h \ - ${srcdir}/include/odp_forward_typedefs_internal.h \ - ${srcdir}/include/odp_internal.h \ - ${srcdir}/include/odp_name_table_internal.h \ - ${srcdir}/include/odp_packet_internal.h \ - ${srcdir}/include/odp_packet_io_internal.h \ - ${srcdir}/include/odp_packet_io_ipc_internal.h \ - ${srcdir}/include/odp_packet_io_ring_internal.h \ - ${srcdir}/include/odp_packet_netmap.h \ - ${srcdir}/include/odp_packet_dpdk.h \ - ${srcdir}/include/odp_packet_socket.h \ - ${srcdir}/include/odp_packet_tap.h \ - ${srcdir}/include/odp_pkt_queue_internal.h \ - ${srcdir}/include/odp_pool_internal.h \ - ${srcdir}/include/odp_posix_extensions.h \ - ${srcdir}/include/odp_queue_internal.h \ - ${srcdir}/include/odp_ring_internal.h \ - ${srcdir}/include/odp_queue_if.h \ - ${srcdir}/include/odp_schedule_if.h \ - ${srcdir}/include/odp_sorted_list_internal.h \ - ${srcdir}/include/odp_shm_internal.h \ - ${srcdir}/include/odp_time_internal.h \ - ${srcdir}/include/odp_timer_internal.h \ - ${srcdir}/include/odp_timer_wheel_internal.h \ - ${srcdir}/include/odp_traffic_mngr_internal.h \ - ${srcdir}/include/protocols/eth.h \ - ${srcdir}/include/protocols/ip.h \ - ${srcdir}/include/protocols/ipsec.h \ - ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/udp.h + include/_fdserver_internal.h \ + include/_ishm_internal.h \ + include/_ishmphy_internal.h \ + include/odp_align_internal.h \ + include/odp_atomic_internal.h \ + include/odp_buffer_inlines.h \ + include/odp_bitmap_internal.h \ + include/odp_buffer_internal.h \ + include/odp_classification_datamodel.h \ + include/odp_classification_inlines.h \ + include/odp_classification_internal.h \ + include/odp_config_internal.h \ + include/odp_crypto_internal.h \ + include/odp_debug_internal.h \ + include/odp_errno_define.h \ + include/odp_forward_typedefs_internal.h \ + include/odp_internal.h \ + include/odp_name_table_internal.h \ + include/odp_packet_internal.h \ + include/odp_packet_io_internal.h \ + include/odp_packet_io_ipc_internal.h \ + include/odp_packet_io_ring_internal.h \ + include/odp_packet_netmap.h \ + include/odp_packet_dpdk.h \ + include/odp_packet_socket.h \ + include/odp_packet_tap.h \ + include/odp_pkt_queue_internal.h \ + include/odp_pool_internal.h \ + include/odp_posix_extensions.h \ + include/odp_queue_internal.h \ + include/odp_ring_internal.h \ + include/odp_queue_if.h \ + include/odp_schedule_if.h \ + include/odp_sorted_list_internal.h \ + include/odp_shm_internal.h \ + include/odp_time_internal.h \ + include/odp_timer_internal.h \ + include/odp_timer_wheel_internal.h \ + include/odp_traffic_mngr_internal.h \ + include/protocols/eth.h \ + include/protocols/ip.h \ + include/protocols/ipsec.h \ + include/protocols/tcp.h \ + include/protocols/udp.h __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ @@ -224,28 +224,28 @@ __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -arch_odp_headers = $(srcdir)/arch/arm/odp/api/cpu_arch.h +arch_odp_headers = arch/arm/odp/api/cpu_arch.h endif if ARCH_IS_AARCH64 __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/aarch64/odp_global_time.c \ arch/default/odp_sysinfo_parse.c -arch_odp_headers = $(srcdir)/arch/aarch64/odp/api/cpu_arch.h +arch_odp_headers = arch/aarch64/odp/api/cpu_arch.h endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/mips64/odp_sysinfo_parse.c -arch_odp_headers = $(srcdir)/arch/mips64/odp/api/cpu_arch.h +arch_odp_headers = arch/mips64/odp/api/cpu_arch.h endif if ARCH_IS_POWERPC __LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_arch.c \ arch/default/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ arch/powerpc/odp_sysinfo_parse.c -arch_odp_headers = $(srcdir)/arch/powerpc/odp/api/cpu_arch.h +arch_odp_headers = arch/powerpc/odp/api/cpu_arch.h endif if ARCH_IS_X86 __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ @@ -253,11 +253,11 @@ __LIB__libodp_linux_la_SOURCES += arch/x86/cpu_flags.c \ arch/default/odp_cpu_cycles.c \ arch/x86/odp_global_time.c \ arch/x86/odp_sysinfo_parse.c -arch_odp_headers = $(srcdir)/arch/x86/odp/api/cpu_arch.h -noinst_HEADERS += $(srcdir)/arch/x86/cpu_flags.h +arch_odp_headers = arch/x86/odp/api/cpu_arch.h +noinst_HEADERS += arch/x86/cpu_flags.h endif -noinst_HEADERS += $(srcdir)/arch/default/odp/api/cpu_arch.h +noinst_HEADERS += arch/default/odp/api/cpu_arch.h odpapiinclude_HEADERS += $(arch_odp_headers) From patchwork Fri Oct 6 19:00:13 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: 115130 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1720648edb; Fri, 6 Oct 2017 12:26:04 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD5h+alcbdhWV4rtzAAdtO4lfY0PttxWJEFU2dgR4a9cP5B1XV6Ek+qLnHQhCpEVcBYbbh+ X-Received: by 10.200.45.226 with SMTP id q31mr4819509qta.288.1507317964843; Fri, 06 Oct 2017 12:26:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317964; cv=none; d=google.com; s=arc-20160816; b=qbK/xv6YKkqf9CQJ9bYbUwtkIwyy6gdvwab081klvd92ZXtQScNsqrjOZ5j5gyd4eA ffYbDqBlkbkmNlrzZd5er9ybQaV4ASsa0Y7QcP4C+oiD4CHl5ERVpjMrsSJqhU0YoHMj NqxiN1sl3oAIdrUTicQFlEdj/t9B7nyoP0xBUq9Ww698cVD+6eqse62yD+VInEFBfYQU Ly6I1rBighQ3BQ1eCh13Gm/QNVUFPea8D2v1Zw7smS/gnegwTceMGTBfzKJpgbEYEWc1 chFVimBg341tv1J5eCGP6SDTGyeC0c8vsgKx9Xb8+Xw9vGqdLHnU7ZXCAnrPuAaoNXk7 wvUA== 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=/n4LFh/zaznhNiPrqNbQUaBRN4BxvSLk66kmROKuSAY=; b=vSwMBMaSbFXIh9wgmlIwsHU5fBRJTLbTrIoABVwXoYO85/ChTwK4U0lzwq7YICcAoV PhfR1wRAc76EloXkbUs5Sy6I2BcXTm8jM5cEaJf02JJQsSQQRe1vdngHCWLaroqSJaU/ cnGyJESgIgf82sfmXrQSlVd+zn/RZg03DrVs4lry1KD71k1jc1eRa/PAGPqetyNi5D6f VVrNYP6wOwxkExZI6Laux9kb9UEzS4Tx8kCq0uSn8G6kOIVJ/c8RR1ULc76jOf7Mq1R5 /haP0p7dabvE0Aqb9zdHXP8zkLF0kZsiYZ6lMtn698FMkiQULm4GJ3g44VP8/9LbUvo4 vutw== 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 d54si1811007qtk.297.2017.10.06.12.26.04; Fri, 06 Oct 2017 12:26:04 -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 7B1F9646DE; Fri, 6 Oct 2017 19:26:04 +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 61EFB65BE8; Fri, 6 Oct 2017 19:04:24 +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 61AA265C20; Fri, 6 Oct 2017 19:04:19 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 2191C65BE8 for ; Fri, 6 Oct 2017 19:01:31 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward102p.mail.yandex.net (Yandex) with ESMTP id AA12B4300F7A for ; Fri, 6 Oct 2017 22:01:28 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CpLKGscYji-1Sxaqk9f; Fri, 06 Oct 2017 22:01:28 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-1StG9DFA; Fri, 06 Oct 2017 22:01: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: Fri, 6 Oct 2017 22:00:13 +0300 Message-Id: <1507316415-2144-19-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 18/20] linux-gen: stop including autogenerated header into distribution 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 Referencing header in _HEADERS variable means it will be included into distribution. Move static_inline.h header to nodist_*_HEADERS to stop including it into tarball. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ platform/linux-generic/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 25b6c31f5..b20b751a5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -68,7 +68,6 @@ odpapiinclude_HEADERS = \ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ - $(builddir)/include/odp/api/plat/static_inline.h \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ include/odp/api/plat/barrier_types.h \ @@ -107,6 +106,9 @@ odpapiplatinclude_HEADERS = \ include/odp/api/plat/traffic_mngr_types.h \ include/odp/api/plat/version_types.h +nodist_odpapiplatinclude_HEADERS = \ + include/odp/api/plat/static_inline.h + odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ include/odp/drv/compiler.h From patchwork Fri Oct 6 19:00:14 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: 115131 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1721196edb; Fri, 6 Oct 2017 12:26:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBnq8A915GZRTHezmz63jazefuvds0qUOS+CAkJl/Yotdz070RXj/gHqoL/4aU4qz69dKaV X-Received: by 10.55.215.153 with SMTP id t25mr33583224qkt.285.1507318002177; Fri, 06 Oct 2017 12:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507318002; cv=none; d=google.com; s=arc-20160816; b=yn6HFjq12UK4+/kZU/esfuWH6tWuw8Pb2/a94VOeXBTDb44z7YdumecBzuixjPw+Fc DZc9s+oUr38JWJd1ymV1RgHApzXRh8VDi99UbHl/A+SDTBwG25gLoKnoQgbbbS+wLckp n6SffuV5yaphSBCJXhpgFXOKhfdBHOmTLghFzXUW4ka8+eiA8vSNjVKJQK8osVCJ+zu4 I0wG+7v91fDo9NnfNEgS0X95w+dykcdctFIwDU7KRmvYMQ5bffqt84Eh1ESpofY8Wi9e 7MSRElh9hnF512ZqaCFRJZ3r/OvNON2N0aUQfnSJm4ZvmvW3flDJQI6oT8Aec0PANXqS 2trQ== 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=Mef4fGrUztPJTsWXicSQbmKNMNBsCSJ+brOAgJ6CcuQ=; b=VCWvfD4uLCSF5OEVSGXqw+Rw9c1Bg8n3eozhRBeXdTudIXf8IigyFPp/4EC9+ZJJ7B 3AJ/TLYV6acOBnlixsLC533/AZ3Zms4fHlDBv/C+Dyhi6JHsGGjG3ACxZ0cLEIPUOoeQ Y+YScBcO+XrBlUxxinTQ7OruuVwQ3LRUV3sWixFnqBy0cl/CmOxcSatFHlssyC5rEfdw DY9rAAf0hrLtLRNjd7gM6zrN1N3T5Aeu1KHCxfMkg+ZeoXAIxu1ayjuUWNVSTze2qFXg ABcJkdgJx7rDHeSBMWNf8xGSrDB3rxyVZ1LJe+Lu4wGNJgxQKkPVDb+jbRl6E8mFuMy0 DgmA== 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 z21si1974057qkg.294.2017.10.06.12.26.41; Fri, 06 Oct 2017 12:26: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 C572760A38; Fri, 6 Oct 2017 19:26: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=-2.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM 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 9D3D365BC0; Fri, 6 Oct 2017 19:04:29 +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 0061C65C1F; Fri, 6 Oct 2017 19:04:21 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 9792064FD5 for ; Fri, 6 Oct 2017 19:01:36 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 6012344441C8 for ; Fri, 6 Oct 2017 22:01:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dCsCZJuJuF-1TWmdI5M; Fri, 06 Oct 2017 22:01:29 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-1StSBNM1; Fri, 06 Oct 2017 22:01: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: Fri, 6 Oct 2017 22:00:14 +0300 Message-Id: <1507316415-2144-20-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 19/20] example: simplify Makefile.am's 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 - Drop unused $(srcdir) - Drop unused $(EXEEXT) - Drop unused dist_ prefixes - Merge noinst_HEADERS into proper _SOURCES - Merge -static into AM_LDFLAGS - Drop extra _CFLAGS adding -I which is already present on include path Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ example/Makefile.am | 2 ++ example/Makefile.inc | 2 +- example/classifier/Makefile.am | 9 ++----- example/generator/Makefile.am | 9 ++----- example/hello/Makefile.am | 6 ++--- example/ipfragreass/Makefile.am | 27 +++++++++----------- example/ipsec/Makefile.am | 53 ++++++++++++++++++---------------------- example/l2fwd_simple/Makefile.am | 9 ++----- example/l3fwd/Makefile.am | 15 ++++++------ example/packet/Makefile.am | 9 ++----- example/switch/Makefile.am | 9 ++----- example/time/Makefile.am | 7 +----- example/timer/Makefile.am | 11 ++------- example/traffic_mgmt/Makefile.am | 6 +---- 14 files changed, 61 insertions(+), 113 deletions(-) diff --git a/example/Makefile.am b/example/Makefile.am index 9503a1baf..695e029c9 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -10,3 +10,5 @@ SUBDIRS = classifier \ time \ timer \ traffic_mgmt + +noinst_HEADERS = example_debug.h diff --git a/example/Makefile.inc b/example/Makefile.inc index cba385b77..12edc46c0 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -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) -static diff --git a/example/classifier/Makefile.am b/example/classifier/Makefile.am index 0c66e145b..a0003e9a4 100644 --- a/example/classifier/Makefile.am +++ b/example/classifier/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_classifier$(EXEEXT) -odp_classifier_LDFLAGS = $(AM_LDFLAGS) -static -odp_classifier_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_classifier -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_classifier_SOURCES = odp_classifier.c +odp_classifier_SOURCES = odp_classifier.c diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 49a74978a..7deeef406 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_generator$(EXEEXT) -odp_generator_LDFLAGS = $(AM_LDFLAGS) -static -odp_generator_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_generator -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_generator_SOURCES = odp_generator.c +odp_generator_SOURCES = odp_generator.c diff --git a/example/hello/Makefile.am b/example/hello/Makefile.am index 2e4e0cee5..a2d976015 100644 --- a/example/hello/Makefile.am +++ b/example/hello/Makefile.am @@ -1,10 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_hello$(EXEEXT) -odp_hello_LDFLAGS = $(AM_LDFLAGS) -static -odp_hello_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_hello -dist_odp_hello_SOURCES = odp_hello.c +odp_hello_SOURCES = odp_hello.c if test_example TESTS = odp_hello diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index f805a69ba..fa7d5c8bd 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,22 +1,17 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_ipfragreass$(EXEEXT) -odp_ipfragreass_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipfragreass_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_ipfragreass -noinst_HEADERS = \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics_arm.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_fragment.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_helpers.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_ip.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_reassemble.h \ - $(top_srcdir)/example/example_debug.h - -dist_odp_ipfragreass_SOURCES = odp_ipfragreass.c \ - odp_ipfragreass_fragment.c \ - odp_ipfragreass_helpers.c \ - odp_ipfragreass_reassemble.c +odp_ipfragreass_SOURCES = odp_ipfragreass.c \ + odp_ipfragreass_fragment.c \ + odp_ipfragreass_helpers.c \ + odp_ipfragreass_reassemble.c \ + odp_ipfragreass_atomics.h \ + odp_ipfragreass_atomics_arm.h \ + odp_ipfragreass_fragment.h \ + odp_ipfragreass_helpers.h \ + odp_ipfragreass_ip.h \ + odp_ipfragreass_reassemble.h if test_example TESTS = odp_ipfragreass diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index fd9b3c722..46613065d 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -2,35 +2,30 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) -bin_PROGRAMS = odp_ipsec$(EXEEXT) -odp_ipsec_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipsec_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - -noinst_HEADERS = \ - $(top_srcdir)/example/ipsec/odp_ipsec_cache.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_fwd_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_loop_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_misc.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sa_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sp_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_stream.h \ - $(top_srcdir)/example/example_debug.h +bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in \ - $(srcdir)/odp_ipsec_run_ah_out \ - $(srcdir)/odp_ipsec_run_both_in \ - $(srcdir)/odp_ipsec_run_both_out \ - $(srcdir)/odp_ipsec_run_esp_in \ - $(srcdir)/odp_ipsec_run_esp_out \ - $(srcdir)/odp_ipsec_run_live \ - $(srcdir)/odp_ipsec_run_router \ - $(srcdir)/odp_ipsec_run_simple + odp_ipsec_run_ah_in \ + odp_ipsec_run_ah_out \ + odp_ipsec_run_both_in \ + odp_ipsec_run_both_out \ + odp_ipsec_run_esp_in \ + odp_ipsec_run_esp_out \ + odp_ipsec_run_live \ + odp_ipsec_run_router \ + odp_ipsec_run_simple -dist_odp_ipsec_SOURCES = odp_ipsec.c \ - odp_ipsec_sa_db.c \ - odp_ipsec_sp_db.c \ - odp_ipsec_fwd_db.c \ - odp_ipsec_loop_db.c \ - odp_ipsec_cache.c \ - odp_ipsec_stream.c +odp_ipsec_SOURCES = odp_ipsec.c \ + odp_ipsec_sa_db.c \ + odp_ipsec_sp_db.c \ + odp_ipsec_fwd_db.c \ + odp_ipsec_loop_db.c \ + odp_ipsec_cache.c \ + odp_ipsec_stream.c \ + odp_ipsec_cache.h \ + odp_ipsec_fwd_db.h \ + odp_ipsec_loop_db.h \ + odp_ipsec_misc.h \ + odp_ipsec_sa_db.h \ + odp_ipsec_sp_db.h \ + odp_ipsec_stream.h diff --git a/example/l2fwd_simple/Makefile.am b/example/l2fwd_simple/Makefile.am index fe2065452..f082335ef 100644 --- a/example/l2fwd_simple/Makefile.am +++ b/example/l2fwd_simple/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l2fwd_simple$(EXEEXT) -odp_l2fwd_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_l2fwd_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l2fwd_simple -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c +odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c if test_example if HAVE_PCAP diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index 21d0cf1a3..9a48ea173 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -1,15 +1,14 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l3fwd$(EXEEXT) -odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static -odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l3fwd -noinst_HEADERS = \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_lpm.h \ - $(top_srcdir)/example/example_debug.h +odp_l3fwd_SOURCES = \ + odp_l3fwd.c \ + odp_l3fwd_db.c \ + odp_l3fwd_lpm.c \ + odp_l3fwd_db.h \ + odp_l3fwd_lpm.h -dist_odp_l3fwd_SOURCES = odp_l3fwd.c odp_l3fwd_db.c odp_l3fwd_lpm.c if test_example if HAVE_PCAP diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index af729b098..228c3506d 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_pktio$(EXEEXT) -odp_pktio_LDFLAGS = $(AM_LDFLAGS) -static -odp_pktio_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_pktio -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_pktio_SOURCES = odp_pktio.c +odp_pktio_SOURCES = odp_pktio.c if test_example if HAVE_PCAP diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index 4134bcf3d..2fb21bc41 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_switch$(EXEEXT) -odp_switch_LDFLAGS = $(AM_LDFLAGS) -static -odp_switch_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_switch -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_switch_SOURCES = odp_switch.c +odp_switch_SOURCES = odp_switch.c if test_example if HAVE_PCAP diff --git a/example/time/Makefile.am b/example/time/Makefile.am index c1db37591..464fbfcab 100644 --- a/example/time/Makefile.am +++ b/example/time/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_time_global$(EXEEXT) -odp_time_global_LDFLAGS = $(AM_LDFLAGS) -static -odp_time_global_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_time_global_SOURCES = time_global_test.c +odp_time_global_SOURCES = time_global_test.c diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index edb8b2ca2..849319723 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -2,17 +2,10 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_timer_test$(EXEEXT) \ odp_timer_simple$(EXEEXT) -odp_timer_test_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_test_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_test_SOURCES = odp_timer_test.c +odp_timer_test_SOURCES = odp_timer_test.c -odp_timer_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_simple_SOURCES = odp_timer_simple.c +odp_timer_simple_SOURCES = odp_timer_simple.c if test_example TESTS = odp_timer_simple endif - -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h diff --git a/example/traffic_mgmt/Makefile.am b/example/traffic_mgmt/Makefile.am index c8ff79755..09aa03b1a 100644 --- a/example/traffic_mgmt/Makefile.am +++ b/example/traffic_mgmt/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_traffic_mgmt$(EXEEXT) -odp_traffic_mgmt_LDFLAGS = $(AM_LDFLAGS) -static -odp_traffic_mgmt_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = $(top_srcdir)/example/example_debug.h - -dist_odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c +odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c From patchwork Fri Oct 6 19:00:15 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: 115132 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1722169edb; Fri, 6 Oct 2017 12:27:46 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC85OOWlVGPlPi1jAvyrgP7xp2Dnj+XVWWX2NwB5YyGHmcoNhEwIZFSWx/NmlkIbRCDpDAM X-Received: by 10.36.65.201 with SMTP id b70mr4019121itd.114.1507318066427; Fri, 06 Oct 2017 12:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507318066; cv=none; d=google.com; s=arc-20160816; b=GgEVpLkbqp0SQEvCBfjsIvhP/RU5YNdcyCdy+csacgKxf/oD5ftPxp9AEaymJ9Pv3X 8gXvv2nmma7Sa16DxNcAbD428Go6g2yT5u9+vRqeA78Sj1UQO4NiBbZDD0uCJz4iuCFu qDY5mFC1wMQIVtQBcHuRE37LYcajNmOp0SrUMXAAwaJxPNmo40kErhWRlqCnpd4ERe5y Tb0sLNxKxUP1lZfcitsqucnOT/+OuGagwTFU/Ci1RVI3EJJ6Ii2M0EjqjaG7qoq2ompy RZ5Iypx/+catYQdktdRAqL4CLQ2VaX1T3JyTYTE+JsTAWVMekMyxh1GiQPV0vRhL6mML v+pg== 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=mwmbE99EQnMnou9U1M2GbWQh3kDvmx7OxlAyNE8tnmE=; b=qGzaIWXt16podfx4735ivHOso6zuKNpsn5IunZCc283Fz8B3SXBbwDNs/73UgmmegZ N/k7ldrZyMjTKci0LSWS5AblABPcvnQk+hMApa+6NHLh/2ED7AtXJsL6mT31TA+AKhmy wg07Sf8ZP8rbivBTt79nbuDJNmVouL0xIZ6AG2w4/ZnjYip4GB+JoFtHdTGyT42ezZ/c ZxzobqKcpB2DEpBEmn4duPo8NKhiCRiARlHh7GF57ZrkF+nLk3N/wIRrSQkwmuw/42+p Vq4pVk30CH5Ae5XuHfDciqoJ5rKHvM4YmrF2JcZKX4GLVHwFiFjgD4p7qadf8G9nriMP RiFQ== 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 b83si1490175ioj.386.2017.10.06.12.27.46; Fri, 06 Oct 2017 12:27: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 F1A22644DC; Fri, 6 Oct 2017 19:27:45 +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, RCVD_IN_MSPIKE_H4, 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 E8C7765C21; Fri, 6 Oct 2017 19:04: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 8BD4665C1B; Fri, 6 Oct 2017 19:04:27 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id A710D65BC0 for ; Fri, 6 Oct 2017 19:01:37 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward100j.mail.yandex.net (Yandex) with ESMTP id E758E5D823F0 for ; Fri, 6 Oct 2017 22:01:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FXWADlvepU-1ZrKdNIm; Fri, 06 Oct 2017 22:01:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-1ZteOC5X; Fri, 06 Oct 2017 22:01: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: Fri, 6 Oct 2017 22:00:15 +0300 Message-Id: <1507316415-2144-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 20/20] helper: simplify Makefile.am's 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 - Drop unused $(srcdir) - Drop unused $(EXEEXT) - Drop unused dist_ prefixes Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ helper/Makefile.am | 55 ++++++++++++++++++++++--------------------- helper/test/Makefile.am | 18 +++++++------- helper/test/linux/Makefile.am | 5 ---- 3 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 helper/test/linux/Makefile.am diff --git a/helper/Makefile.am b/helper/Makefile.am index c668386d9..ee1c17d6d 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,47 +2,48 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libodphelper.pc LIB = $(top_builddir)/lib -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_CPPFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ + -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 AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ - $(srcdir)/include/odp/helper/chksum.h\ - $(srcdir)/include/odp/helper/eth.h\ - $(srcdir)/include/odp/helper/icmp.h\ - $(srcdir)/include/odp/helper/ip.h\ - $(srcdir)/include/odp/helper/ipsec.h\ - $(srcdir)/include/odp/helper/odph_api.h\ - $(srcdir)/include/odp/helper/odph_cuckootable.h\ - $(srcdir)/include/odp/helper/odph_hashtable.h\ - $(srcdir)/include/odp/helper/odph_iplookuptable.h\ - $(srcdir)/include/odp/helper/odph_lineartable.h\ - $(srcdir)/include/odp/helper/strong_types.h\ - $(srcdir)/include/odp/helper/tcp.h\ - $(srcdir)/include/odp/helper/table.h\ - $(srcdir)/include/odp/helper/threads.h \ - $(srcdir)/include/odp/helper/udp.h + include/odp/helper/chksum.h\ + include/odp/helper/eth.h\ + include/odp/helper/icmp.h\ + include/odp/helper/ip.h\ + include/odp/helper/ipsec.h\ + include/odp/helper/odph_api.h\ + include/odp/helper/odph_cuckootable.h\ + include/odp/helper/odph_hashtable.h\ + include/odp/helper/odph_iplookuptable.h\ + include/odp/helper/odph_lineartable.h\ + include/odp/helper/strong_types.h\ + include/odp/helper/tcp.h\ + include/odp/helper/table.h\ + include/odp/helper/threads.h \ + include/odp/helper/udp.h if helper_linux helperinclude_HEADERS += \ - $(srcdir)/include/odp/helper/linux.h + include/odp/helper/linux.h helperlinuxincludedir = $(includedir)/odp/helper/linux helperlinuxinclude_HEADERS = \ - $(srcdir)/include/odp/helper/linux/pthread.h \ - $(srcdir)/include/odp/helper/linux/process.h + include/odp/helper/linux/pthread.h \ + include/odp/helper/linux/process.h endif noinst_HEADERS = \ - $(srcdir)/include/odph_debug.h \ - $(srcdir)/include/odph_list_internal.h + include/odph_debug.h \ + include/odph_list_internal.h __LIB__libodphelper_la_SOURCES = \ eth.c \ diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 983e2c685..0606d5727 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -20,19 +20,21 @@ ODP_PLATFORM=${with_platform} AM_CPPFLAGS = $(INCFLAGS) AM_LDFLAGS = -static -EXECUTABLES = chksum$(EXEEXT) \ - cuckootable$(EXEEXT) \ - parse$(EXEEXT)\ - table$(EXEEXT) \ - iplookuptable$(EXEEXT) +EXECUTABLES = chksum \ + cuckootable \ + parse\ + table \ + iplookuptable #These are platform specific extensions that are not portable #They are a convenience to app writers who have chosen to #restrict their application to Linux. if helper_linux -EXECUTABLES += linux/pthread$(EXEEXT) \ - linux/process$(EXEEXT) +EXECUTABLES += linux/pthread \ + linux/process +linux_thread_SOURCES = linux/pthread.c +linux_process_SOURCES = linux/process.c endif COMPILE_ONLY = odpthreads @@ -46,7 +48,7 @@ endif test_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -dist_check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads +check_SCRIPTS = odpthreads_as_processes odpthreads_as_pthreads chksum_SOURCES = chksum.c cuckootable_SOURCES = cuckootable.c diff --git a/helper/test/linux/Makefile.am b/helper/test/linux/Makefile.am deleted file mode 100644 index f95e04d51..000000000 --- a/helper/test/linux/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la -dist_thread_SOURCES = pthread.c -dist_process_SOURCES = process.c -process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la