From patchwork Thu Oct 5 08: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: 114852 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp5721edb; Thu, 5 Oct 2017 02:05:49 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDkZbMD/lfLyVP3uzF6/Nke/n4QwelTfdX57eK3sdBlU7JdGeui/+Tx+XIm+nKWsfkjDdaq X-Received: by 10.55.79.71 with SMTP id d68mr29520257qkb.247.1507194349680; Thu, 05 Oct 2017 02:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194349; cv=none; d=google.com; s=arc-20160816; b=hqgLQNnsvZ4A9nh69iyLWON3uEZb4IxYpBNY8bbAJm3VWy4U4hyKXcA0DmZlxNNfa5 c/2xAcIjWsr390qoc+FOA/P+8Ub+BmwE5mmdzuwHRcnLE/2Y6ppSitks+ZYFcsM5FZjD pEkhA4pjkpbnUgW/lnoComYUePeiWKgvzZNH6uv1fYLlGhujIOi639/pig+GEthoFbIy go24Gb4jzurFUqbE720OMztvP7xClyauAQDMyWHiN7dATbh0VrBYVvLVF+nBS043umb6 IzSoeiNl6ykd9dAIrs+HaasgQOjZIxtNf9iP4UspRCo1OCPSUxrHK1lUqyUWDrvWb2/W Y80w== 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=WW3PU20QkAKXFiJ3Cg6LIlElKXutke9RBEHT/oVGHNQ=; b=rDIaYduzLrMFU6yItJ5HhNvWwW1/vY/9dTFlmqbLj9nO3gJLDAlT1QaCCf7dHIG7R/ 2A2aU0oG6az7cZeX6tWKUpkNWXRge9AWKoybhWR7bWGLe04zU+oVH14UZou4PU+1KlBm 8q0M3bNLntVrNuUwz+F9XVZCAoSvtQcKOwE30opFIHdqzDoS82M10nrbuQcjLVjGyU6M cXPKUKKAfQlry8zwAyI0MBpgbint9ZrldGVal2zB27uAR6AHs75wJ6WumoU1lw4ufn3K sjZ5bqjezVVXwyp2gqca9PRZ78CwxraMF000G/QWmtP1SzFDZsqu+hBj52pJ1cJ8Ypkh 54HA== 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 125si762636qkj.443.2017.10.05.02.05.49; Thu, 05 Oct 2017 02:05:49 -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 32FF1644BD; Thu, 5 Oct 2017 09:05: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.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 A289A644B5; Thu, 5 Oct 2017 09:01:07 +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 61CDD62D1B; Thu, 5 Oct 2017 09:01:04 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id EADC362D1B for ; Thu, 5 Oct 2017 09:00:27 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 9BA84474C9 for ; Thu, 5 Oct 2017 12:00:23 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ig6ZoPXC8J-0NjSbmqx; Thu, 05 Oct 2017 12:00:23 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0Mau7sIV; Thu, 05 Oct 2017 12:00:22 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 11:59:59 +0300 Message-Id: <1507194018-5453-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ .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 Thu Oct 5 09: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: 114853 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp6745edb; Thu, 5 Oct 2017 02:07:10 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCk0CgEoRG+HAtxosTz+oLYZ02WqQZJmXgCsgeYjpWGjkLOHd2/ms12wn7d/GK9Lq6ZJWko X-Received: by 10.237.56.102 with SMTP id j93mr16706277qte.57.1507194430383; Thu, 05 Oct 2017 02:07:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194430; cv=none; d=google.com; s=arc-20160816; b=grIt6uVxxOyQcdrot6YKS2ooMgxZjTj0wej6a41CaokHLuFuDyBkUw/qU9J8NmCPyp 8l54b98Dor0m6gNC7BVa/1GOuAvFHNowKUyRDPNWITZzNlYOZeijwB9HkMiW3SLuHt8l sPZlhtSkOIl87xTvYr82gZL+ih/HLvuZ9hi/Q/HsUuSwEur0J6nBU2fzlVGZCeT0r+Qi mmccnVKO0CHsyFmEhW2DD4hTzKn7prllNPzRn/LDF2THbaFKty3sUx5H/XCD0DKDGwYv ZIzww+3yQR7t9WcwDRo4oC+atkTqsMEAqcoJ8/HG+UrPNJQZGZ/xsMTjxD4KfbMLfxCk d3cA== 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=gOHcvy1bdZiyowVnAFMLRqlNMva7HTNDT/kY6jVReUY=; b=vlH/2djGlp1NdGnXKIvLixLRD0giNz4owlsryk63NFN/Hl0Dy9QeMzlXv6rfAD9to2 Uo+hJVDqCRzuujW7vNSEZ/OYp4N1wMdTknzgIcmGZpz9zatakDP8DRT0iePeqiLpkuEv SQ83fh0D6VUAmVdzpSTvgOm+hdf4OqL3FJdi3Jiym919QqsGzfTA6maGG+IEoET2VVDQ 4uNIRPXn6aKt2q1DKCeLQAiY0KKC+BoCzkD2NcZDjEuyKZ7df/WoGIl4KHkJsdC5fXaI dSBf/9V1ivr8Ze8JSnQRsATzFAnKxUn7L2jl/H8i9NyZJM4Xk9w9sQ6qdmB6hVpgtVTT FSuA== 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 p11si4386808qtb.373.2017.10.05.02.07.10; Thu, 05 Oct 2017 02:07:10 -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 02E5B644B8; Thu, 5 Oct 2017 09:07:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-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 0823A62C5C; Thu, 5 Oct 2017 09:01:39 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 936AC644BB; Thu, 5 Oct 2017 09:01:30 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 7F95162C5C for ; Thu, 5 Oct 2017 09:00:28 +0000 (UTC) Received: from mxback7o.mail.yandex.net (mxback7o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::21]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 402B84302465 for ; Thu, 5 Oct 2017 12:00:24 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BVqEWJD0ox-0OMuGjdJ; Thu, 05 Oct 2017 12:00:24 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0NaSBGTF; Thu, 05 Oct 2017 12:00:23 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:00 +0300 Message-Id: <1507194018-5453-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114850 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp4116edb; Thu, 5 Oct 2017 02:03:51 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDMlwUqZFHLXdTMqQM1BSkgJUkzMgRqqxekAIuSt+1Zs+hRvUtCVDrtkj+R3wJm4563vgQ7 X-Received: by 10.55.6.22 with SMTP id 22mr11125894qkg.340.1507194230925; Thu, 05 Oct 2017 02:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194230; cv=none; d=google.com; s=arc-20160816; b=MrIMF82tgHg6C8lj8x8AUyxM1S+gDUKjNM6dOcTE9PLqFnrXIBuJv+KeTNZBoSVIVx ssHGTC/g+zJmim4DFp+FN6dmKDr/aoOGbD/zEnBHY/Vscmyw6AzKikKxapNWXFGT5j7L CgN1rVqgBmRlM4/Jchmh5Vnegnm3ylI0EbNeWShDMbiMuGsLaP3EdKoM2rHDEzplSKR3 U1PIV0RRM1KzxVmRijkEzFjnBlsrwi/H49uwpQrQ0SY4JLawCXRmsKGYMM/wyig8jY5E zP2jQC7qA8TRUW+OAA3AXBBrFqEkGJA0hwgdk2VFjN1IwVZMdqPlyfboSM0VAcIVS32Z evvA== 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=VsVKQaqeQEda2+4/RjlbovAP/yjmDlYsRPR7zIeM6x0=; b=kntqQG7ahtQv+Oz+ZTm+wzYQoDZwna774w2guWVZbJop5y+ZeTQorSkj8gcVNHNn8Z hci3xmxNY3GnqjjHu7Y3IndqDTEqt+bgmS59oANFBmc6shlLZLbXsv4uDwzJDI4UaJvo P782N2qY8YmZ0GAA+RTCTWT5KNEmULYTLuYelKhM/Z8JDHqIDvtrOCP+P6r3BX6hqCtk Wvy3wVE4KminKqLiLBX1DKCK1uPQFK99NHqr1NN2OmA0kWm/heE9a/joQDTvUC47/yHF kRdhfJbY19SS+i9YwVbn2+fEaAXTHJrBUszIjfxVKUKxKGlHyDx+All0Hf+1uFJCIutk FTNw== 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 e35si2406977qtd.444.2017.10.05.02.03.50; Thu, 05 Oct 2017 02:03: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 7FA88644E1; Thu, 5 Oct 2017 09:03: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 014A5644AB; Thu, 5 Oct 2017 09:00: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 94B4C6449B; Thu, 5 Oct 2017 09:00:32 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 8154361BBA for ; Thu, 5 Oct 2017 09:00:26 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward106o.mail.yandex.net (Yandex) with ESMTP id CED8C781A90 for ; Thu, 5 Oct 2017 12:00:24 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1XmwgI1eHU-0OPWI77H; Thu, 05 Oct 2017 12:00:24 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0OaWTYVL; Thu, 05 Oct 2017 12:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:01 +0300 Message-Id: <1507194018-5453-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ {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 Thu Oct 5 09:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114849 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp3297edb; Thu, 5 Oct 2017 02:02:52 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAH1ham8VFKMfAZMcLT7snbpWwbpl6p7Dv2wRixuVYX8alYtwQv7yjzq9su/OssxHO2Pis2 X-Received: by 10.55.181.129 with SMTP id e123mr30273599qkf.128.1507194172650; Thu, 05 Oct 2017 02:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194172; cv=none; d=google.com; s=arc-20160816; b=DZSozjNq5gvp64N/DQCh0qHMx5cYb4maT+D7SKrY22Xs6OFT01uDSxf+QAtPmcp1wc XzUb3mOLxHrhtbk0QjYIrVPuRfPuLY/WCBrIKn0HKI3Js/KkGBuS2QWvw2CfqL4DvTZH q5ftJHPFtSUqcHkhqdfpQo+hBaGLHnYDTlz0YDIgsSx5gRK2aSeAoYlCNvzMPC/hcf2k tajBERW9HIF0b1t/xNKKHm8LBJJtXUA7Z9YpLRjZH07x4fcrME0Cn4T6p0YEsCbuV8d5 gCuglGf3vyurK7Z+uzb+ep98gfBcdfSAa8zy70kyGQkHI8IV0LdsvMd3M9JBQSQhH7nC uirw== 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=6k8p+lAeUP138AgedCOlvDn0a3UL/AVzpVI5xJrgAdM=; b=PYxtyleW9hfUrLkBt9BG0I31coMvHF0i5IXUWeXn/WS2Igw6JGb/Vk0MZkdAJRVj9i 0v5b5R4BJW3ctDWs1zfCM8CeFvmt1++4sJf0ADf/nxIfN0bylkMoG/yWT4cp4Av2PDu5 L7uks6e5aMFML9V9joPOvcaJujRM7NvKTXUHUrnGAjn6upiEJGGzAfXbJ39BocoamRAZ uCgFGkG8Ljz3wra9DwvAgzvuThlyu8fXYoFL0XcIh57Bv5l6zHckIiGZhdq0wIlWk6gh xYSxFDa1g/ai8jl29fwwHcDq7zqIlAkrnv8tkJnLwsPgt5TVr0Zaqyzx6QpRSIAFvRU7 mhZA== 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 n17si160408qki.236.2017.10.05.02.02.52; Thu, 05 Oct 2017 02:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id F0D68644D2; Thu, 5 Oct 2017 09:02:51 +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 6E44A6449A; Thu, 5 Oct 2017 09:00: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 89CF96448F; Thu, 5 Oct 2017 09:00:29 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 0470462C59 for ; Thu, 5 Oct 2017 09:00:27 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 62AB2184EDF for ; Thu, 5 Oct 2017 12:00:25 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Wm5N5gBjUX-0PP8v98C; Thu, 05 Oct 2017 12:00:25 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0OauDGjY; Thu, 05 Oct 2017 12:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:02 +0300 Message-Id: <1507194018-5453-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114851 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp4889edb; Thu, 5 Oct 2017 02:04:49 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBxotJ4+gu3iCaEcEHjj+3MreMZ2klPEG1VUi5cZBDfm4rJ7BnpNBfZEKt8lhICaxRI/uke X-Received: by 10.55.24.93 with SMTP id j90mr29523648qkh.301.1507194289712; Thu, 05 Oct 2017 02:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194289; cv=none; d=google.com; s=arc-20160816; b=GD3eV3qwS5xl++xIjNV/1uGQ/AFOa7vXeVJYz+dabVH1BzjjJVwSz67keG0WwJ+mX2 9QwwlKPSy7fPpL/ps6/VhidVNk/QPYkgjQxOr428fnah8uRJqzWzTnxlyRs6gu3dz8bN kfYdgW3PykYjF85/4hVN31kCv2wDQMUXuwG+SgctgiQ493+Ppg1Zh6byP14X74WRi5+R WLInUhzD2fkebl9gAvAFi4m+lzeT64Dv1VQaH2kwAZfytWZY1dQw1KFP3UoWGCGMo6Fm Py6AnTWaRRWxeQKE5Rv8PNrA3LtVKkJqRO1I8XtH/ILFrCoIEhq0T3U4XsGjTT9rSTCS Amvg== 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=X2fhjz+S4B+J2317XbA5NYFB7s+kSGvgAz/yB22vamw=; b=laKcfyVzSUP8hByPSK7iWIE5vVXgfK9fvkgqgrD8hco5SCRQUMfk+MRDkw6a6RjueX Z7J7fkGfw20CmB6GRjszMobQCbxwFm6F1xZrMAr9AsJ3a3CYxqkIk/uGzxCDH5oeQWJ2 PMxWmDq6H2iVVD80/wuvUK9Q92l1NspiKm1VVjV+tvzRoW0ZH2JsyeG4B3m0cyBVKqB2 fZHxFtJxq0utdhuBWeDV8JbMR6jCdRv6Odc1F6NR31CTk9hIO8/Jz36koWnXeqDfc1y5 cjHd715U7BtveZmlZLfUbGHRT1btZUGkw/5wZfP857fsHnzz2fd67oxWO8q43zjluz35 0cGQ== 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 u2si3411262qtd.361.2017.10.05.02.04.49; Thu, 05 Oct 2017 02:04:49 -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 14B17644AC; Thu, 5 Oct 2017 09:04: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, 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 45138644AA; Thu, 5 Oct 2017 09:00:48 +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 48D56644A0; Thu, 5 Oct 2017 09:00:35 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 53D4B62C62 for ; Thu, 5 Oct 2017 09:00:27 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 1B75E5D82867 for ; Thu, 5 Oct 2017 12:00:26 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pohl58T7r2-0Q6miQIE; Thu, 05 Oct 2017 12:00:26 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0PaicVdC; Thu, 05 Oct 2017 12:00:25 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:03 +0300 Message-Id: <1507194018-5453-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114854 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp8217edb; Thu, 5 Oct 2017 02:09:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAlWeFYxu6ztZeWXH1nxg0tjwBpxv3bPjt5d6mVDNKLngcDR9qdmrORW5D5fdbdDgQoAYND X-Received: by 10.200.57.164 with SMTP id v33mr3128088qte.204.1507194549815; Thu, 05 Oct 2017 02:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194549; cv=none; d=google.com; s=arc-20160816; b=ImNyCx4sjKU/ZcAHwQkFvJtEasqj5EYoFI14MWVaVGxT3fxwp72IyCX/th7BzEcHij tBZeAbxbIQj/nsw7/D3fzLK5m+dxnCmMXuKpIrJKqVWHkSLuon5AgmCRfGtASXU0idUj Bl/41UJ6syg5zB3OAgwQrhe4IvP0Gq00VvMZ7HCDDcn9Ayp7U+h9dVVz4DDSn66JHwKz jPW30jTSkZXz6N4OC5RNB+YwCRBiScwyDMioQTMMHqzwgRPsBgPFCUpQWmDrjCCCPaWI yVIcUVmkN7LkAxMcvsJLRpVmHjt6rQ1eBFIKbgVTpuuHeK3VgD4/gRqNrYdbbKKErOH9 olmg== 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=lstHbg7hoQMbDoYcBhC8HoniXCWRkxfAEzGimYWpdLc=; b=F/YERMpjUmoP0WiSCuo5u1u1bI2BaYkz+l8vsIPGJEmdmidTb69iSprQsPqyVM3aR3 8b79viV4BGbWxiSeSn06j9fjt+Yd5RV7FrhjazT24GKrwVwhqq0Qvntjya3jxnHQegSe q1ZaI9E3sHVUQiZkVpesfB+k4ZGSOA15jJ2N50H9gYlTGFnBx6GDdI3w8bu7Bno9Ug5a g9MJdxECIqomWa657BO7kb6vsEIR6kuHYzduEtBmdmh6bG6q6KviCcSH42cKH+6DsF49 BNW1gPLlIINIIZa7PrYnMVWU8f6rNjeY9Ps3ypOuMksA1uXsO3BfU9nl5zZnVi9tDcZu DBOA== 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 k44si1898301qtc.351.2017.10.05.02.09.09; Thu, 05 Oct 2017 02:09:09 -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 73245644A3; Thu, 5 Oct 2017 09:09:09 +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 DE946644CA; Thu, 5 Oct 2017 09:02:46 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E7E8B644C9; Thu, 5 Oct 2017 09:02:36 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 4ED256449D for ; Thu, 5 Oct 2017 09:00:34 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward101p.mail.yandex.net (Yandex) with ESMTP id E227F6A8655E for ; Thu, 5 Oct 2017 12:00:32 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mAmyG8H3YF-0Qa0RMab; Thu, 05 Oct 2017 12:00:26 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0QautOnc; Thu, 05 Oct 2017 12:00:26 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:04 +0300 Message-Id: <1507194018-5453-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114863 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp378239qgn; Thu, 5 Oct 2017 02:25:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD5m96bGp0Dwd6ZyeB5wRelhGXZXk+F+LEbWL5VJh5RML8HqCILH6kbxbEpuCPNiy61Nx84 X-Received: by 10.200.34.173 with SMTP id f42mr14707017qta.22.1507195509725; Thu, 05 Oct 2017 02:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195509; cv=none; d=google.com; s=arc-20160816; b=hjzcsmcgTNyvlYv//+s3moqghCzHgMfWT9AkIrAq8LslezHo55nnexYFMZQ2ZQ+1Qh aeN/V0SRDQ9ZXloAN4JLNSkqS7leDRT0QO0DCFX0aOERbxAA638Rn/BS7a5+kZPeH8p6 Tgjv/JCsfK8rPZOyzRtviS5z39rqdbrCHt9e4O6gfnq5A5AXvqcibAEWZo6Y5LV2kA4D OmpCn7tgWg+0wD13z/yduivdV1BrGt9mvjBcnVgTZxLKqo/KCrZqHpO4VX+X3pCHjep8 7dp0GhIAXww2NIIHOzuHpxolVCeKxcANSFAAmzmmvhUr+1XVHblayU/UqcfuIivgbzHv yOKw== 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=H8J7g1T2n3dh9ItME7iNZJSNg0abm017SQOhWVa69Jk=; b=a/ith9b8y5h9Rm4iXpPlu6kAjk2pa8WoWxYk6ec/s48OUuNkVSWpDctMKWfp7m0Oav 7TixUbcj6Hxk7oEwLGKBItP4M/zmPpcA2utiPq+Zj6sLsFkfh8Z59OS/uITBaCqnGezT ktWl1IYVT56omo3GSFPIkGAM5GhCzeBFWwAbyicOaA9lcfW7BrR//TItpdWFHjKm24ja feHSOkr98AMMh/liQ5LYGIqFQExHaQE7JL16pCfQ8TcCt7MVtCnwhyNLJdcBfs9EWsYD caPiTAVnrIbheOvDdJMK0IU5XyKFaR2Rmv+9pVGf+XI1up0Wdm/h3/xZFnuDvmmJJCmU /6GQ== 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 b32si512162qtc.120.2017.10.05.02.25.09; Thu, 05 Oct 2017 02:25:09 -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 4F4B9644E3; Thu, 5 Oct 2017 09:25:09 +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 3F641648CD; Thu, 5 Oct 2017 09:04: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 C570C6486A; Thu, 5 Oct 2017 09:04:09 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 2E119644A8 for ; Thu, 5 Oct 2017 09:00:50 +0000 (UTC) Received: from mxback4j.mail.yandex.net (mxback4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10d]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 83AA9186330 for ; Thu, 5 Oct 2017 12:00:33 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback4j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id skLrNpjxXV-0X306xOB; Thu, 05 Oct 2017 12:00:33 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0Wa4lQg7; Thu, 05 Oct 2017 12:00:33 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:05 +0300 Message-Id: <1507194018-5453-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 7/20] test: move test/common_plat/common 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 In preparation for reworking tests, move test-related libraries to top-level directory. 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ Makefile.am | 1 + test/common_plat/Makefile.am | 8 +------- test/common_plat/m4/configure.m4 | 4 ++-- test/common_plat/validation/api/Makefile.inc | 4 ++-- test/linux-generic/Makefile.inc | 4 ++-- {test/common_plat/common => test_common}/Makefile.am | 4 ++++ {test/common_plat/common => test_common}/mask_common.c | 0 {test/common_plat/common => test_common}/mask_common.h | 0 {test/common_plat/common => test_common}/odp_cunit_common.c | 0 {test/common_plat/common => test_common}/odp_cunit_common.h | 0 10 files changed, 12 insertions(+), 13 deletions(-) rename {test/common_plat/common => test_common}/Makefile.am (94%) rename {test/common_plat/common => test_common}/mask_common.c (100%) rename {test/common_plat/common => test_common}/mask_common.h (100%) rename {test/common_plat/common => test_common}/odp_cunit_common.c (100%) rename {test/common_plat/common => test_common}/odp_cunit_common.h (100%) diff --git a/Makefile.am b/Makefile.am index 6c43679e7..774c09bda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ SUBDIRS = @platform_with_platform@ \ helper/test \ doc \ example . \ + test_common \ test @DX_RULES@ diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am index af78bb653..80c35f870 100644 --- a/test/common_plat/Makefile.am +++ b/test/common_plat/Makefile.am @@ -1,7 +1 @@ -SUBDIRS = - -if cunit_support -SUBDIRS += common -endif - -SUBDIRS += performance miscellaneous validation +SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 index be878bd7d..e04737e18 100644 --- a/test/common_plat/m4/configure.m4 +++ b/test/common_plat/m4/configure.m4 @@ -2,8 +2,8 @@ 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_plat/Makefile - test/common_plat/common/Makefile +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 diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index c4e80eb72..eb5ef34c1 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,8 +1,8 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common_plat/common +COMMON_DIR = $(top_builddir)/test_common -AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common +AM_CFLAGS += -I$(top_srcdir)/test_common AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index cfb614419..2aba84d28 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -6,11 +6,11 @@ AM_LDFLAGS = -static AM_CFLAGS = $(CUNIT_CFLAGS) -LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la +LIBCUNIT_COMMON = $(top_builddir)/test_common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) -INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common +INCCUNIT_COMMON = -I$(top_srcdir)/test_common INCODP = \ -I$(top_builddir)/include \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/common_plat/common/Makefile.am b/test_common/Makefile.am similarity index 94% rename from test/common_plat/common/Makefile.am rename to test_common/Makefile.am index 5736214a0..dee3404cd 100644 --- a/test/common_plat/common/Makefile.am +++ b/test_common/Makefile.am @@ -1,3 +1,5 @@ +if cunit_support + include $(top_srcdir)/test/Makefile.inc noinst_LTLIBRARIES = libcunit_common.la libcpumask_common.la libthrmask_common.la @@ -9,3 +11,5 @@ libcpumask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_SOURCES = mask_common.c mask_common.h libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK + +endif diff --git a/test/common_plat/common/mask_common.c b/test_common/mask_common.c similarity index 100% rename from test/common_plat/common/mask_common.c rename to test_common/mask_common.c diff --git a/test/common_plat/common/mask_common.h b/test_common/mask_common.h similarity index 100% rename from test/common_plat/common/mask_common.h rename to test_common/mask_common.h diff --git a/test/common_plat/common/odp_cunit_common.c b/test_common/odp_cunit_common.c similarity index 100% rename from test/common_plat/common/odp_cunit_common.c rename to test_common/odp_cunit_common.c diff --git a/test/common_plat/common/odp_cunit_common.h b/test_common/odp_cunit_common.h similarity index 100% rename from test/common_plat/common/odp_cunit_common.h rename to test_common/odp_cunit_common.h From patchwork Thu Oct 5 09: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: 114855 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp8881edb; Thu, 5 Oct 2017 02:09:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBNaxnqwrzMenh7JOv4n33IExVy7jcqsUfX8jRHYNdouewXPAxAWu2EA5OywOgJ/QgAdNJn X-Received: by 10.237.37.103 with SMTP id w36mr23812216qtc.325.1507194598636; Thu, 05 Oct 2017 02:09:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194598; cv=none; d=google.com; s=arc-20160816; b=d2+zj2KL8X+42DDyX4RUviYeWen1b4AnlWK3PFsQrZ4/4xVou+gID0Mb9gcO3EVzie ujsn+3BwfnivN7ZwBfkgGa90argAlu+uxM2FOQdLco7KNwZa0XJbAc8NZqzFwSu7ZiWH A9DBepdkfqOlIH5MGB/RLwU5rAJLh9Q2O+MuaUMRLob0S3GgXblnKRQpccWR5teM9Jmt UEI3hg215eQAmJfGnAA8DjsFUUK8ZGKE3G8D3TaYggpNEZZIUSl1pllivALJk14mcqLR nLB2ayDxaki9+1dzgA1cxrivfmjpPWFnzUjXed9bW1SVfgNy3ZvT2gQCGGx2afv+97Xw YFNQ== 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=c31B1CNGjZrP0SrFkx7MG8F1fOwkBPDe56m7THPwD/Q=; b=IOC4YWnnAGKI7CTboQ7d3YrWYvKFF+q1YReWIyZT5FB3u/4qEn3BJqrR6RZBaVE2nv FvdasKKcXxjazwW8PdaPEJimNYfdZhnQRnWfm97ZmI+amTyoXkIbPGHi8omTEmNR4kUt +veJsLTAC0BQjOqlqcyB5G1amWOhVwiqmkXcj3W0YkfLRfKivkDssFi1pqALsvZO+r9V YDr6lu3FL5/4MOcEor7xn9fBIkuNaPxglTX2dRCUIGQIVQCpERVddHT/Ot4I9MGY9umu WXp7mMXfsX6FGCf7yTFY7aCG6jz3KNKPGXuw5Vyev/ZxVJ49LjKGZ8fsfNtCq98uwpWF MWHA== 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 f7si1438051qtg.72.2017.10.05.02.09.58; Thu, 05 Oct 2017 02:09: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 4CED0644AF; Thu, 5 Oct 2017 09:09:58 +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 57289644CE; Thu, 5 Oct 2017 09:02: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 4EFBB644C8; Thu, 5 Oct 2017 09:02:40 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 5F7E162C62 for ; Thu, 5 Oct 2017 09:00:36 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 5000C4303E6D for ; Thu, 5 Oct 2017 12:00:35 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Bm3JROKzug-0YvSs6S9; Thu, 05 Oct 2017 12:00:34 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0Xa8uLcg; Thu, 05 Oct 2017 12:00:33 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:06 +0300 Message-Id: <1507194018-5453-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114856 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp9606edb; Thu, 5 Oct 2017 02:10:53 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAzY+f+GQSGw2taLxrk/ftxHOJ5wARUjm/DdyeAs8dKn2oFqTnhveKaHZk0fqx3mQU24enk X-Received: by 10.233.232.14 with SMTP id a14mr18844871qkg.256.1507194653510; Thu, 05 Oct 2017 02:10:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194653; cv=none; d=google.com; s=arc-20160816; b=VQUdqae8qeBG8ZkxjOJsdj1ZRFLLL1Yac47b4hY3yYgN+kT0ZW6376Y6aKPPXjVOI+ wt/PdHMjswML/kyp+EgPfoV4nJ6DM09IcvzSFMATTKyX8fTKkg+wD/AWopxdmJLNcpOu c6c/18xP+e12Nd5MxL4tHJFjhuN9S6eE16K6ayuqsQfQI5oxHweg7wRLD2o4ZeH/vnUH VGkSVhVV8lWd8CoP8E7/ipikji/MbuaUQesncXUg7f58p2bEL8fG6kD9up/+0saPB88F AS78Hy83ZHaLpL8r2V90c6ko4ODsrtVzVEP4ElRE4cck1M0a0gxuwCVvj7g+KrhBbl1L mMaw== 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=4u+z1+u1z+A4MkwO9xVZXeV2YWUfcjNSJa76RYvEjaE=; b=yoVK+PlJJU7q1Lm/gsQ7P/7Rg2MdfD12U/ZwbqQOot7XILbIDo9YP3Axs6NWvR5kM+ 7EuC1Pyn+UzegsFGl8x9BNuxNvCdId1XlrHHDg1EfCP0x5+T9CN8AGDL5hctaThckiV+ yyBZeWO5DLuyK633Z3WZu9qhw3tj0BObBB0VDm+tGDHGGttPdY1w5nwgTKzWSjLsx26O 6ArQMiktEImnjekXOzEiSC0ii7IWUVx04huA1cTflMGpY/3Qy3xvUAJyqahL66MTLRZz 4uHFpaE+KDvig9dH8bjwpR+RC7xrfF65Y7wTi53N8uMbwL7nEUxqkcf/LbVe8R9y9ixl 7pMQ== 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 x189si160713qke.336.2017.10.05.02.10.53; Thu, 05 Oct 2017 02:10:53 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 175B961BBA; Thu, 5 Oct 2017 09:10:53 +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 0607E62C6C; Thu, 5 Oct 2017 09:03:11 +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 52D23644A0; Thu, 5 Oct 2017 09:03:03 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id B4FFA62C6C for ; Thu, 5 Oct 2017 09:00:37 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 548F92188901 for ; Thu, 5 Oct 2017 12:00:36 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cEfP0nijYU-0avaxrrN; Thu, 05 Oct 2017 12:00:36 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0ZaScvge; Thu, 05 Oct 2017 12:00:35 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:07 +0300 Message-Id: <1507194018-5453-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114858 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp11809edb; Thu, 5 Oct 2017 02:13:50 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCBnPNQmCXABV1qubZ6RmcVFXn6eN1f72azYYFUdfjLL+WUUdk3Ci5rgk8yV0ErH5PlyUBP X-Received: by 10.200.45.151 with SMTP id p23mr5437754qta.164.1507194829893; Thu, 05 Oct 2017 02:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194829; cv=none; d=google.com; s=arc-20160816; b=M4qi+qIP13Pqef2Uvp3tYNi1JbtEtUClPIfE8AOMhdSVbN+m2cJwzwYetFHyvn6saD 5tabDDikOFvIESKFVnrVg5NSgEqywhgS/oHSlT4BQcoIPj1wOCwpw8+IaXPOVVMNJ7Wk NAtFXL2HP2ZiSxhnEIlWM1RpAHN2pWko4jjlnfu8v3WVzM9ZKsVTsMZJRRi9WV3EIUSP 9wgJJsfGJSEQC1CfP+AxUQmpccB+2QmyM/QyDdnxkIh+hJB+DdvdxssbDd4wCYPPfbfj XRS4XjKyn/+BmDCkSJv2Wf9mtm4wRIyBdT2k5jYK5bEf49Z87o1Jv/4RaIiEwLZ+Zj8M dtgg== 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=3MJBhofagcbZOtdrDRrmITVyi7M/E5Nr3iiOZgbAJwA=; b=Mj52uBhvxxrLJsA5RIv4RYWrRre3L44CsHYPdI2nQ+AxuDGz4jJIvLIh2re06dLTDM Cz+plwnHF685BHjDqMs5/4kevEBjAxnFiI2P4/YzpWMPT3jNkejBhyIt839dgLoyLc0+ c9kXxsmepJ/9vA1aHZaSgvmPYcSuQiHzANLxvTGL4jedxBw1iDZVdIJmvw7cJ/KaxQpu dhYz5+GOh/CHCqwUcNHNLyYMBi4u505RL+8ZeGTDR0612cMHHzW5D36+4es5jAHdn2c7 wdhvDbkPHjNR6dQBE8LAmYxoDnCQN07Cfu2UG4FhVymRyxVekoHDLeIt3RCClC8pAX9f R1rA== 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 31si512455qtn.534.2017.10.05.02.13.49; Thu, 05 Oct 2017 02:13:49 -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 7D30664493; Thu, 5 Oct 2017 09:13: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, 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 E3D74644DB; Thu, 5 Oct 2017 09:03:31 +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 4C268644A2; Thu, 5 Oct 2017 09:03:17 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 7B1CA6449F for ; Thu, 5 Oct 2017 09:00:38 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 7A698184ACD for ; Thu, 5 Oct 2017 12:00:37 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YRWI8mgGx4-0biiR1Op; Thu, 05 Oct 2017 12:00:37 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0aa8ENog; Thu, 05 Oct 2017 12:00:36 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:08 +0300 Message-Id: <1507194018-5453-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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..f99d83635 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)/../../../../../../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 Thu Oct 5 09: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: 114857 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp11198edb; Thu, 5 Oct 2017 02:12:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBo7DwzE6stVnBLofVio4EGTvPvDGrNjJxStOMJrE1921UlXftnWWgqcIDph9/g+x+MvFqy X-Received: by 10.237.42.106 with SMTP id k39mr3990811qtf.37.1507194778814; Thu, 05 Oct 2017 02:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194778; cv=none; d=google.com; s=arc-20160816; b=MFmkMpG1CvOwrV7az1DGd3nKUcAXUnNDNIQCOqYMF4rRYGr+CwY28CksNjGdlrPzD1 y0jDKrRt3H9uyuMStubvviYGH/XkTXXC94FSHBNEwf/qkekFH/f7Emwfa4xpzzgzkA9t 933eV7q1wtkv//X8tao8tZ5OEQdilw2imz2MZ7BEUVkn+Y/+Bz6y6+U5rkyL7qUgoH2x TOZkX2VqoYWgHwKVmrvsNE0hWrBABdP4Wr0c13fFJ0wdh/51hd5d1ckC4gSHsRvTVmah uwYnnMYreghXHt9lKgX0a0CnfyuS34FsDh2MF/zJTx5kRRSpzrM4/UoCq/yijtJJKUFl X+3A== 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=YDQyGUweUbVwsC+tBu/vWv5Gj9gj9RMAsRMOxR92tgY=; b=0x7TbKfpITVgNAH8nWowgD0A2NJC4uDPJtX717UOr1/JIIV2mgrv8GzrUWhR6cQ8pS GSet2fs25Y0fveAwku1GqRzojFJ8e/aZLHZ8kutB92LfNPxndzHR2rB0uEikyq2bg4Zn ix7dca+T7xIRfbGoMPegaCdySq7kYOV8a1Rje7Y0/n8orZTPwuT2Nvy51NwU/FpzVW3s 3DgJ69vgf8vSKt2EROltgVTQopsWUkNxapK/yISBnVQPmj4+gS32rD+kreyYIU4riJ10 /+A5Cnw3L6ua1+/Zw6mA7Zp7Wf4mAvsVX8TpdcrPzAhsgn1jsZZ7cnIdJQCw95GE8cD7 lP/w== 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 s184si14540078qkd.167.2017.10.05.02.12.58; Thu, 05 Oct 2017 02:12: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 6BA7D644B3; Thu, 5 Oct 2017 09:12:58 +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 8D9EC644D7; Thu, 5 Oct 2017 09:03:20 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A869F644C8; Thu, 5 Oct 2017 09:03:15 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 00A0A644A2 for ; Thu, 5 Oct 2017 09:00:39 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 10C0F186542 for ; Thu, 5 Oct 2017 12:00:38 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id qMSW3JH8bb-0bNOIhnB; Thu, 05 Oct 2017 12:00:37 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0baqW7Bc; Thu, 05 Oct 2017 12: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: Thu, 5 Oct 2017 12:00:09 +0300 Message-Id: <1507194018-5453-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114859 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp13600edb; Thu, 5 Oct 2017 02:16:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QApzFH6lVFaa0is96s46O3IW5wNS6rZkrs5emXWO+++dT10hRtyV2CY1W+jqzsAS3Cwk7Fe X-Received: by 10.200.17.1 with SMTP id c1mr5512821qtj.198.1507194976054; Thu, 05 Oct 2017 02:16:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507194976; cv=none; d=google.com; s=arc-20160816; b=sf/V6gvQYgUrrgoZUfU3gLmhoMRHHauTpf3LJ1SpwT8o9S77GOPOPwG74iW8DVe7Xu SXA5TSYVOQbyUWtmV9+6w3riy81Lvy4gQBcntnP3x2d4rAZlZhxJigjA2K211ynYi8DI XyXbjOZKjd5r+FXxiK5NZDTG+hNY86LJEFNJ+GSsAop4HPCuVyivK++ZDjUiyRQqdiC2 2ZMU9dBOyJUIFYDokFBrGmTj97DYzp3jxTwYAkej6ZejsltHLSbn0Lmeh1O2Vca3adTp QtBhX29mPacY2JQhKiRwX8tQwYquKlfnys48gTxMlzosIcAkCX3VeBxgx2cx2RLhH9QQ LeZQ== 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=0AdCDDwgdD1XoX9T77nQzdzlxZDqEz80IQDHtKuR6fU=; b=Pzw+fGY9GeVqZEVLjRc1Wy6ig4ksA9ddDFHpa3fBHx6X/qfLuPTWxpCgULR/nnLC6J pQ+YqhXw+5kiT6pBTUYNE1OPjYZihJbU0dKFcJ9r9lDB0e8/ZzVcJLMGbAToNzkNVt4J AiKUZ8y6gYCD4LfXnF/DQy8Pvwa8pXFMVMnBajPyPTAY36QGOuCrww6lCzDEiXOjBBe5 esJ/ycAkqzMj1yhLzIuie2aG0jW0r+pzv/RWyL5rNfo4Jb4gK29n9qARhjdnko9cqCf/ tp6qqub31Z/mkSePO7uof+WmfbcJxLdZRINp6kobVBmdVlgiTo5nPveVBPifV9vM09jv FiAQ== 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 k58si8348824qtb.405.2017.10.05.02.16.15; Thu, 05 Oct 2017 02:16:16 -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 8FCCF644BF; Thu, 5 Oct 2017 09:16: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, 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 59E0A644DA; Thu, 5 Oct 2017 09:03:46 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5C839644C8; Thu, 5 Oct 2017 09:03:29 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id 0C306644A5 for ; Thu, 5 Oct 2017 09:00:41 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 171524804A for ; Thu, 5 Oct 2017 12:00:40 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SfJm2Do2rR-0evCl4Jp; Thu, 05 Oct 2017 12:00:40 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0caWHkAN; Thu, 05 Oct 2017 12:00:38 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:10 +0300 Message-Id: <1507194018-5453-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 f99d83635..c7c11f157 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)/../../../../../../common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../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 Thu Oct 5 09: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: 114860 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp16253edb; Thu, 5 Oct 2017 02:20:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBMX3qZhl1Xh6itVpDSwoL2SxdNxtktccrd56cNWAFMx9tDJLxEOARRkobhofWd0ZS1nrX5 X-Received: by 10.55.207.11 with SMTP id e11mr4368186qkj.89.1507195216416; Thu, 05 Oct 2017 02:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195216; cv=none; d=google.com; s=arc-20160816; b=gKz2LV6v3Ht7z9ir5TytMcn4SvUlo2KpTP6SxIo1CM00409T82RV75J10piEvcZtx9 NFR2U7mr3E7M3hU/xwGGZ+VxfUaIAUtQbr04JibBNuIVbf+rwDQ3m1ELTg2XlqGESLbG akM7WtQWNKsXsnb7doYm/vBzLX+ksG4K+CvxC43o0jGnx1ZdhxAI8X0toHf7Lg6q0wq6 Tkhg6X2Nh1C2SoOQmnB9860YkwXyCaK2KpvJzq1GKx3b8Kj+zwaDNbsCFxSCAO0ODfum mN7uvG9RsP1bV7rmL4JA4IBTER81jiV4eWJu8/5vndRJJUT1xUqwmKweszZXRgcSGNar 5uzA== 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=I/Dk5EhAKZa6yb/2m2yZvY4HWthSMDnoU6I74BzwlPg=; b=nBY7fW+QakHnDFgvzvMYWX1oSbvU9hzqpQIYCaDvO5FmFLBmFZkjV7QwVUOIxUpImH HJQ2GJQSnza05fc6kPCbTiRJPvUhlomiQ28BXoQ2SY8/1tdHddJIMy0r4doAfb+ZZtBg 5crXLxkeCNNfo7AezM42swBakkJm1tPgM9tpDo5zfOwKEI1gx+P3HuXqUWLnxDW3N1Hd hVXKElCu4T9uu/q61HNB5PoXgku4mA4mWUdDdxRrI5/IO+CJzJW+4fz0GVZIQs9445zL qj0xWD6Rgc2JxnOtWWaxoEGefdS9JWqsa1sy/RG8EOgdyKsQ4gRqyEiypClrUqSw3XPv uQzw== 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 z16si2039515qti.34.2017.10.05.02.20.15; Thu, 05 Oct 2017 02:20:16 -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 A2DC2644CE; Thu, 5 Oct 2017 09:20: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.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 B12F5644C8; Thu, 5 Oct 2017 09: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 919C9644DF; Thu, 5 Oct 2017 09:03:32 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id A7778644A9 for ; Thu, 5 Oct 2017 09:00:41 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward104j.mail.yandex.net (Yandex) with ESMTP id B83CF480BF for ; Thu, 5 Oct 2017 12:00:40 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id hzwomgg4oz-0e4epb7t; Thu, 05 Oct 2017 12:00:40 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0eai3GAH; Thu, 05 Oct 2017 12:00:40 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:11 +0300 Message-Id: <1507194018-5453-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114861 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp18152edb; Thu, 5 Oct 2017 02:23:08 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDUW0PgZXJ7v2SuxYOm80b9N7+zRDjbSQtviR5HDUuRF0yJISz69rSrk05TG0txceF2t8Z5 X-Received: by 10.200.48.151 with SMTP id v23mr16953926qta.97.1507195387901; Thu, 05 Oct 2017 02:23:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195387; cv=none; d=google.com; s=arc-20160816; b=ZUT4pREpdpPcXdP9rj6Z5M3dMN4q9vSaiSczNoDFkCJ8pyWY4EHbewGDCHxCzl5voO miXLuv+Vb8uiNldpzLUC1WsHC1FDs96yyfSVVW9fyZuZnGbEnSeTpvE78R4MBLymXT+h rcSC4w9pt+Blw1Z4BGiWzAzJ0fWN1QusVhoXqogXZnhwN9VHjwitW8p4B9rMmr16oaKD CuoZCXQWkDXxHsY07yfHqbellDq4fYZoqCZ6TiwTgkD5iXtiB5NSJZbKZQLoVEJvOvwi 8SQmllawgMCHdvtSlYcGih7/admBu3hAKDbrRGEhB/ewVFW6dHnmxAIDTJwMC5LLRZmO MKug== 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=He7h2xvhsk7B8AjMd54umTVCazi1jkBj54szWn9mHEA=; b=XIeJxohw7anVuhpvBUcXFTNN/bulooCKyq1AYsnF3lW3UQpGW0ChO849W4bQnbSwBr HFaFggowhj0gf914rlZhsQfikN97fsl2jDqcmwQ1z0AO/AnY7Sk3b9umxuCRV40q6iV9 yJGHTmBQappRcVyIzk+txbSM/0uckWMm6zVqwaDvAeIC/831tX5pnHRQCH2OfDiuKaLr 7BEjeqKPqMj4CslJSFVjFVb0hgsZUaj00O1GC6fC1w0zvPgUwADlZmnMnNrvFbg1FsQV GnZS8+rTpDMlF1VujOqzvF9qMzQvyFo+uJOkdggEVMT9p7ocW4J70YxdTGLrdWKRYI+T ZdVw== 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 p11si4406035qtb.373.2017.10.05.02.23.07; Thu, 05 Oct 2017 02:23: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 6E012644DA; Thu, 5 Oct 2017 09:23: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.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9F0F1644E3; Thu, 5 Oct 2017 09:04:05 +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 58573644E4; Thu, 5 Oct 2017 09:03:57 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id DAB17644AD for ; Thu, 5 Oct 2017 09:00:48 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 5C07D702010 for ; Thu, 5 Oct 2017 12:00:47 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 2tU7lsseiv-0fKaouvD; Thu, 05 Oct 2017 12:00:41 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0eaiNPpS; Thu, 05 Oct 2017 12:00:40 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:12 +0300 Message-Id: <1507194018-5453-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114862 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp18691edb; Thu, 5 Oct 2017 02:23:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCCfekrPprWAzzuTNYmK2yJ7jORbJpmDjiGOAeOhY1IDt0jXQtTVMdLuvGwkvgFTC4hphfS X-Received: by 10.200.1.206 with SMTP id b14mr34460953qtg.66.1507195438583; Thu, 05 Oct 2017 02:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195438; cv=none; d=google.com; s=arc-20160816; b=awhn0QNrKwODXNnFHBBvdv3TWlJ0C/ULflS0JPKQf3z/LIO0W1aQYYFtCWXkAxam7F O4eC24PKh20w7nx/wSoM3XGui2/udIbh5k89O3qoWOPuBAojSwUaI1HjpLKRE2Xo3XFD nUoz/28Sa+uGXoA+HBHA+RzsA3KDRLl2N5ihu6woxraVdVRko3Jy8xVWUAlkbAu7cCAa iIAYZNVruxjIBMQjkQCRGrXWvn6LAq5JO0IX/Hnkc4p04BO127Ep+OveQ94kk0VnXXA1 OpgGHtdzK4tryAIc23GyY1U5guIogD3Ci2P1wwUKGANvjyGcMpfjCvmfqMSxCOxvfGqM YEmw== 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=NzFsXkHsq5LHREk4mzb/Oayt7SfRgXvtPNHlLPsH5O4=; b=kN+VKIMp2DLkUmy30UeFk3/BjZ64FrpD95o6i4mLcv/V8/N0K5jju8wuEWrKNWypTb hmkg0+ASFrAfcm7giE2r/3aZvo81pZKph75zbFDRHOEhR85EBb9rD4F+hLRUsTveGmiK SZbut+MM7EGsMXFcKFE1JTEyR3Ceo2EMkFexJhYGYnGn38OY5q/BnaNFWLTCPwu/xMiM 5Qpz4unKQgQrGw3Em/cay8/rFgQs8aQEcos+gws4DNY68lqYi5F4dH4IAIx7YKyf/T+2 GQm4SsEeeRk5alcnWJUAansrPo6P/cPpUtpCNL1l/9bdhULWVwIXFlZpKUNLhIHU6V4w GuHg== 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 g16si11373686qkh.82.2017.10.05.02.23.58; Thu, 05 Oct 2017 02:23: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 35216644E3; Thu, 5 Oct 2017 09:23:58 +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 EFD86646DE; Thu, 5 Oct 2017 09:04:10 +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 39617644E3; Thu, 5 Oct 2017 09:04:00 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 1227E644B0 for ; Thu, 5 Oct 2017 09:00:49 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward105o.mail.yandex.net (Yandex) with ESMTP id F313F4445731 for ; Thu, 5 Oct 2017 12:00:47 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7tAE65DB3H-0lICfgSH; Thu, 05 Oct 2017 12:00:47 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0laqm9Ax; Thu, 05 Oct 2017 12:00:47 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:13 +0300 Message-Id: <1507194018-5453-16-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114867 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp382326qgn; Thu, 5 Oct 2017 02:30:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDL6nhs5PjlAUzXbL4KqwFHAp+7xS9sbCWSuMk6ntSGzrkN5vuHzIao9pPscXwawmV0B9rz X-Received: by 10.233.239.215 with SMTP id d206mr13975449qkg.59.1507195835346; Thu, 05 Oct 2017 02:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195835; cv=none; d=google.com; s=arc-20160816; b=odqS5MwRUrfmfrHXHZsXRO2PHxziw2zRNn+sx51u7KRMt8JAeO9REAjQ/4j1L4Xftw r08yl0T/SAydjFlTcabbV7pqp1+pzbBxkRaDETe5H6ww2CNXQo7ybMdEJEzx/95hvIil TKANO8W3nBUzfbXNBTAxZIjeQBVks/8b1Y+azVY9/V0/8C467E3eJ8oDwmjt4Yct6A2+ Wrh89EFHXYtwloj+JUJKG7tMGeG3zW0mEMENkp/OFrhJVl8u4KioZDpfrrtJrO1UaHsE IgdKszIGue1hy5kvvKZ/0HeNlTb97fInzg12Kc6O1QzZASQ1/mxgtbuhF1UNYc3xw6ND SlDw== 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=RwNI/a2eRMLyYT5MNFnR7n387UlCwhRobTUbqiIpGDI=; b=GnFWCFCSML6LWbV0W9RBYodaz04AkAQ9dPBre5KudlH2NBp4fJ37NgE2XC02/sJegt rd8bURPvMrBnIlSZ5Thj7WvArhApRqpPGSWVLtWlDI2XUGJe7RSdhmCJHkMVi/9cXPkj yKMcP1F5UAtWF7tfN+kLTUWqXCWGpM2TbXScMqaO5ET5hccF5JEBkMTy5VjHbGg/ODnb IfPQZPuIyY0+m0uWTtWffLnUi9T5v3Y2T+ELnwzqc5pkBxkeApOtbbT267CkjEdys94m tS/VfnjyXlkqVnhmCqyeq1gtV2xow1q7/zbxPOkrEdb6tVPFKnXI/T3UV+bQtz0dGQDq zmsQ== 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 a22si5800251qth.197.2017.10.05.02.30.35; Thu, 05 Oct 2017 02:30:35 -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 E77DC644CE; Thu, 5 Oct 2017 09:30:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 A972965BC0; Thu, 5 Oct 2017 09:04:45 +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 563F065BC0; Thu, 5 Oct 2017 09:04:43 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 490EB644B6 for ; Thu, 5 Oct 2017 09:00:59 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward104p.mail.yandex.net (Yandex) with ESMTP id CC2B618502D for ; Thu, 5 Oct 2017 12:00:48 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zBjMWl57Pl-0mDSBuGg; Thu, 05 Oct 2017 12:00:48 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0ma86YEH; Thu, 05 Oct 2017 12:00:48 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:14 +0300 Message-Id: <1507194018-5453-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09: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: 114865 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp379657qgn; Thu, 5 Oct 2017 02:27:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBHzhzgRxO/NWFuC+3tWiwAO7oU7z96NKrpihKWpjfAsKeFsUB4Cct0vUqhry8vRe5j0ICW X-Received: by 10.55.26.90 with SMTP id a87mr26497801qka.132.1507195627668; Thu, 05 Oct 2017 02:27:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195627; cv=none; d=google.com; s=arc-20160816; b=cilq3W9pPUu+QUYKknC25ll1gC3L3xzrFaU7fnLQ+tBpOw2wSDPOmYX3glniDwXJ/t m1zEcKDibWGpgebSaExT7GfMdUcKteB0hkeIaCphvgh2fjSV5oAj4khXw7xzQIlnB+1A pPMvnTcc4uhTE8kz+7K2jiKAmz6wRUpxWOIuUTM489TyYpnP/tOe5wguw9jrNGILnIRc ZWiEzS45xDwwRXUiEwi4t/2cYlOne7K737DUdZo6IrjG0fPzwcqF1/cqsYxSicKMv55E j6fgLju0D5pLcPUhErrQ+mEaS3eJNwt/usbY94UGrGoro3dkh0oTeIx43gGJm/lddPfs +BNg== 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=1ZX26FX0zqHeFOhGUBxMfnDiNrV0Gy+uE0bcX7TfCPI=; b=nmqvw1vRsRPqYQM9gHijnAhL+HDEcvyH0ITUy4mc/ly5aWBWPL7sXhBk1/bLWLzM4M +w1d6oHQpTHnAio6/LP89LfGDosYBNrP6AycrEUobeglvCi2NhHKgzQhoEpYw8VrsLkf qPHgUv+ffbJNg0FqmmBitmXMQ2auOvPIFi3DQZKL7F4qPd9UN+wi9JpN6fRVM0+VNk1l CsE2aTK2tXoduOvzUPE6ENlltiDAlDSHIBSkQMf7z6PBzzzSdGdjXGSrp35r8JywfPm/ 1tU3Uj6tUh5ZGfewMiHLWLDCSNrVZeJxvvWdDGehDOnU9WjMYbtTsjjp9t4XWX32NX5H 5kHg== 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 b16si2262238qkh.258.2017.10.05.02.27.07; Thu, 05 Oct 2017 02:27: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 56DD460814; Thu, 5 Oct 2017 09:27: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=-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 CD3C2658CC; Thu, 5 Oct 2017 09:04:22 +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 AE12E644AE; Thu, 5 Oct 2017 09:04:18 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id E74C9644AE for ; Thu, 5 Oct 2017 09:00:50 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward101p.mail.yandex.net (Yandex) with ESMTP id D0EE26A83A11 for ; Thu, 5 Oct 2017 12:00:49 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Skg0hfZkmy-0nQe3lYD; Thu, 05 Oct 2017 12:00:49 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0maSUvwO; Thu, 05 Oct 2017 12:00:48 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:15 +0300 Message-Id: <1507194018-5453-18-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09:00:16 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: 114864 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp379169qgn; Thu, 5 Oct 2017 02:26:26 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBaeh43uhEB7Q9wEnW8XZ77W/VsSfXmkIT/r5RZvB1ToX2p3cyy6bfgCVr5Cx0qM1XIoqM1 X-Received: by 10.55.99.69 with SMTP id x66mr8703209qkb.87.1507195586752; Thu, 05 Oct 2017 02:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195586; cv=none; d=google.com; s=arc-20160816; b=Y4Bln3CcHgMBLmvbqOLge5JDUkV6pdBBaBMeER2C4H0/Isv9ghbMKjn6YDGvS0hRl6 f4DhnUXu3gfeK54TAd8ym0ip3Jahzw/3FqtngBRywqIA2NwW4Y1RjTWf2ZKg3IJCOyBi 8mZTczGnLYiSEUS+X08RdhAlcuJzePYTR1kav4ICdFWSlVYaCzAjDdeblMlGp6OIVP9t dUaal9C6RgrElpd2Nw0IM3vkrpZ/PiRlmHVwxcL2Gp+rPLHnViZBxSj00XhP01CKD0lk CNFdvhUMa651Xh3YRqlSUWcu4/WgSPuiI+0nG0lUdHrISUarlVr4yhQAwh/XfU+AGrXl igbw== 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=I4EaidkzFcEXFWYupL3Mh4SZ4Jy7k3CdbeqXOTJp54c=; b=f0xQ0HGWPGK+qWW18nYHLVgq5V98KgX2ZtJV39FUpduc6uNRJ5Oqpw+1MxwAKrz4Mi 1baq6lbvzyGrv1FZgXSBRpXtPTaUPjDkFGFGo35SMIx8l+qnyBzLnNcgT+6W3cSP1v7d 8NxzEqXgAM3muUWD36vDNnLxZ7yV5rSHXLOueF5Rtl7WMoUMlHEUBDAbzOw1neRIPnGL Jo/p4EepEdxeupJ5OUr05km/isMrmet3Fm3Tkf7tf0BqnKZntPXSS3pYO2sWqbxfpmVD 6LA9BDH9umbeQjgiH0NqJlzrMcFsTa1xAMcTc6aGGKkVNkXrUh/ys6KnHTomQtcB6PG1 ARUQ== 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 s14si1078407qth.165.2017.10.05.02.26.26; Thu, 05 Oct 2017 02:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 60A2F644E7; Thu, 5 Oct 2017 09:26:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 88D8E644E4; Thu, 5 Oct 2017 09:04:20 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id EA58E644B1; Thu, 5 Oct 2017 09:04:15 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 7E14E644B1 for ; Thu, 5 Oct 2017 09:00:51 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 8ABC35D849FA for ; Thu, 5 Oct 2017 12:00:50 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ooyrVJTb6B-0oDqTYHO; Thu, 05 Oct 2017 12:00:50 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0naiknUE; Thu, 05 Oct 2017 12:00:49 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:16 +0300 Message-Id: <1507194018-5453-19-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 Thu Oct 5 09:00:17 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: 114866 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp380901qgn; Thu, 5 Oct 2017 02:28:54 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDMJCHLftjHKfdGQSu4a3tlQe4Q2/4uek/jv6cP7VhX0Bb1P+dxGTPfGsBWZanVYAK9kQgC X-Received: by 10.55.191.129 with SMTP id p123mr29669704qkf.47.1507195734765; Thu, 05 Oct 2017 02:28:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195734; cv=none; d=google.com; s=arc-20160816; b=Qqz+SGwbaK2edHP018F6My0q7Q2Opvsj8AasJnlhijQwr0/KGmXXT+WPTMlpoKSltg PfWzyDyAn4v3rQPlSw2u2XuE/kiVnczXJvgNrSBRATxp8ZzwF702069F3IkVajvwB+Qi hLebvaMt3Uw/IyHJiXBXHSDWUUQEnBzopYSEQag+rdCC5Ffol00aZD2fFS2dlBTmW/b0 rSAMsGjxpVLVVrmo1kRtaznU9cGcmsRoCRdn5iDjsBTv0tSsUENSGBEQ8yBblAVv6M3k FBMAvfPAM0A2Q2IRvd+lNna8r1WJhaQ6y0mjkj8w/fjpb3l53GZXQ+N/2r3t+1wEkSMr UjIg== 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=Q9bOkknpkeDLFmq9wBwtM2TCt0/IaXvRkxpVWVZEoOo=; b=DMwRleFFIVFdp/aK3YSrePAzkprrvxbLdCUT75LgX6Y9+BSNpRXuDW1oWhSmh5qQtK FzYAACdX4raxiZDCQpv/6Z1m4m/Iu3mA0NqrTYyrzikVFzzbjDZs73jn155WsjOk/jjE JT7ptFvEFQij6Q9Fo/K56dliqBl0c6lyLP+BCfYbHo0u+IVoHow3BlC/rP7/SZbanzGy UZjAbSDQtZnxbbPc7X6LXO9HrKiKPRXRZk5uE4QwhN4cxB4Uzn8i1URlK9Me3B3BdftW z4rfr44hBTZTLUd2gTsmhGz77ftleGHVz0Q8NFGSscUU6fJdCT5pAG0O1Bc1TEba/+U8 7mbw== 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 q72si2709865qkq.26.2017.10.05.02.28.54; Thu, 05 Oct 2017 02:28:54 -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 536A3644CB; Thu, 5 Oct 2017 09:28:54 +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 49C3D644B7; Thu, 5 Oct 2017 09:04:31 +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 727C565897; Thu, 5 Oct 2017 09:04:25 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 4054D644B2 for ; Thu, 5 Oct 2017 09:00:52 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 47A856A8400F for ; Thu, 5 Oct 2017 12:00:51 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id MtFwbOJn8a-0pk8xvQP; Thu, 05 Oct 2017 12:00:51 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0oaiWool; Thu, 05 Oct 2017 12:00:50 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:17 +0300 Message-Id: <1507194018-5453-20-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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 | 55 ++++++++++++++++++---------------------- 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, 62 insertions(+), 114 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..ebba27c37 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 +bin_PROGRAMS = odp_ipsec -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_SCRIPTS = \ + 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_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 - -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 Thu Oct 5 09:00:18 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: 114868 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp383233qgn; Thu, 5 Oct 2017 02:31:36 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAlcLRqSOS7E8SkCMpTimrQM6fJXBNMmtP2XpvrbmOAvW3QHBigd6TUaul9VoRenxQgmpxm X-Received: by 10.55.195.25 with SMTP id a25mr25411678qkj.325.1507195896381; Thu, 05 Oct 2017 02:31:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195896; cv=none; d=google.com; s=arc-20160816; b=tig12FdyAaun0mYF8fNO0ml4TGJ9RhFMXbGARWyeb3ScvvtFtYkn2MIEN1FjRTnhrw lKNZlCpvlHg5cPH2DqG97ThbCjSLIsZbghlD++1b1h0LiifkeTObBSsRCDb7sR/LGPSC qQR8gIkRzxDfvI1l9OMhZVDXvHXvpcK+ZFwBf2KNWVKkTaC2zimp5uPIdOLII6XzBc8x HQbUuPuzctpoSBxCIeBboVDm2Z6STen+rbsMwNT56j1sPzjsNrUXj6lurBATewR/KkFF 6wV/JG0msFE4GJuF8iUmVGXE/F1ZVbuX7MntksMA3Aqn/2Id8LicvPJh6N3VxqF4GMm/ FJ5Q== 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=yb86XrbH7Oo4B3PBJ29tBlEvX3BuIp0ArXf66NhY9f4=; b=VsEgpzX0Pz8f+esFiePhn5EULTbky8Com43/zzG5VENnIj7yaersvgHSSTW40PGX2J JG0TrsZZlAjwsijXCJo1QhLpAAIvSNpvjcXGgE7v4GPpwzpKlU8yLIp8KMqOWHwObKY6 cK0l/jcfSNC/qzQGo8hcjcUaoJHO+VquGhTNvx5hjj76pxG/m8ijjfV8zyzgvvdcDJEO TLZzFl8FT2nMOvbxsKHjTryvWVDYGXJWi5+BPWEXvpmXPKbthLMjJpMNb9PZjbyNe6Wz F1SQCmkpsRNDWuY7CbdLBIv1ZD0PNeUBx8uE/D+lZa9ejKrqC2V2hrPJRa8xXTfF+MCa DtCA== 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 j56si5061623qtc.548.2017.10.05.02.31.36; Thu, 05 Oct 2017 02:31:36 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id F29EC644C9; Thu, 5 Oct 2017 09:31:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 510DA65BC2; Thu, 5 Oct 2017 09:05:07 +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 6CFFE644B8; Thu, 5 Oct 2017 09:05:01 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 6E491644BA for ; Thu, 5 Oct 2017 09:01:01 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 20CDD185C5E for ; Thu, 5 Oct 2017 12:00:52 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dxRFOZ1p9H-0q4CjB9V; Thu, 05 Oct 2017 12:00:52 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0paKwlLF; Thu, 05 Oct 2017 12:00:51 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:00:18 +0300 Message-Id: <1507194018-5453-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 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: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ 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