From patchwork Thu Oct 5 09:59:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 114870 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp49026edb; Thu, 5 Oct 2017 03:04:37 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBNRV8QmaJ0jP8Q2xm45fjixUNbPiTzrxLpW0SbegxnkIA3Of5+4/ZzpZ+00ykwIPqT741I X-Received: by 10.237.57.135 with SMTP id m7mr22636284qte.4.1507197876932; Thu, 05 Oct 2017 03:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507197876; cv=none; d=google.com; s=arc-20160816; b=l6NRhBT1n5PQ3et12QyF2UCk2eX2BnHf5yS2EHthgeVvj/+h7q0XCQNYNNT3HKsPAQ /k0D2b8sN0VYloRHfWcuz7pJ39A0FwmtlAEqSJByIr5SmWnrnQej1Tkj9dIVQhiyKuuQ Q5R8fBKfQ0goyogIfzF/+Zn8kEUeQfwxDGBymAJjEYami7nwuO+pASObOdoeTbjm3t2U 7Gx81jU61hgWfshKqpmdb4E+RoLpNyakli08anH+dVRq73GNF5kACqePgbn7WiuQiaZy fBS8krz+0gKkc1Wi+Baqp5793D6fBKMVVbhkxCKx4A6l/ywmlIg0Cc0fFgpKWQ4HU46R ooKg== 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=nIT63UCC9HoTzZcHfBYFUPPZ7HOuc/6aWG7aTQYvbaw=; b=mvz/dw71VlhFEUJCjqHbNuJhasA+5ygR87Aqs6bAw9sE2twWpDjZgwcwYdY0yc1OOp F0aDwBDGnGQFsiC7RedtYLMT5Dny9NpLQV4MryGaCmE1bjC+e9rBKUumiq1S2im7uxkP WoxoG03MyQmZSljd8VcdlW4ml30RwP70r9LVgww4YpV1B6WfDHAT90Cz2hsIja1o7rld MMuvVN4GzySBRuVlqMM6kmsQLva8WMLMAZ6hvbFpff+kVpbgUmDVfjixQJV215PHXyi5 /7qoglpgnmS7jX3nU1oPh5q/SbPqFbrD8qMs/Ew7bTSQIcUVYgaR3whn1zy72q835poj +26Q== 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 38si3915157qtg.230.2017.10.05.03.04.36; Thu, 05 Oct 2017 03:04: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 9FEBD65BD2; Thu, 5 Oct 2017 10:04:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 047C4644C1; Thu, 5 Oct 2017 10:00:53 +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 706CF609AC; Thu, 5 Oct 2017 10:00:28 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id A8A8E60BEE for ; Thu, 5 Oct 2017 10:00:23 +0000 (UTC) Received: from mxback4j.mail.yandex.net (mxback4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10d]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 3DE1A34C33C0 for ; Thu, 5 Oct 2017 13:00:22 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback4j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YKrBkPLIw4-0M3adEKF; Thu, 05 Oct 2017 13:00:22 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0LqWsJbN; Thu, 05 Oct 2017 13:00:21 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 12:59:58 +0300 Message-Id: <1507197617-6215-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ .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: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: 114871 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp51368edb; Thu, 5 Oct 2017 03:07:12 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDf30E/kKqFM3Ihsgijmdbjy9Ph4oIOh9sQ4KkfUBzQ9A7VI2akrT+yocT4G7w+jbTWqzxa X-Received: by 10.55.156.141 with SMTP id f135mr19998879qke.309.1507198032175; Thu, 05 Oct 2017 03:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198032; cv=none; d=google.com; s=arc-20160816; b=aFfZeKaVHE/Ku1Gmdw5RQzk0b9Yt4vFyGpGSgewH7GpKaoiprhTnw5lZ4y6tqJFRku 6yxzPLdIuYCwnxAIYUI+Bt/z67uAsqkHYQJZjhvxq34phbblukFXQCC+KzfQBxswTVMg EykNcQD1Ry4Zmno3/+FUfDXRES0PDrpnyy5K4/qVdfKIu05zYCPjdMATI6qMKJ3ZK5U5 0C0XP9eIXpDxaQWkcRsSyjnpI9/lA6GXEXAI2f8cm6+X73ofCwGXu0KpUwGiOZ8tUsOC y+cD3v1Wh2aRLXgPxO7UYJUmvcC57vRep8MDbJ9pqkvXBWfivnx8OayuAFs2NXgLh1jF ZUxg== 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=hO3GkQ3vsvJWXH83gOmu0bmTLn/JtStTAtpu4h4pXQc=; b=n22go7CAwFtx/+L1M3/jDCEN8qu8I9zUHGj/H95RdTwKrFH+oUVse62UR++Whnbb17 kpDhqf4LuwLdKSublqPHQW5scYJGHHsjUiDBPFHxAYh7IB35QzLB6YlBNJAAniRZ35Bb bhxjnRV9ZsWFSG75qDy4FQsa5amg+baAajbjnF8bZYIbgPR8a7lU0H1RBc4TabGy8hVz 3VTlH7LAypKdbshzjKN/Qs7jXRNlW6v5YERWLWu8asLBZmP+25o7OcDGU5XRVlPNKyNL L4HRueolhivHYHtxAWdASaYtlwpzMDl/jy1HM3p+5RVpIxP+qdPWNor+LHfmeDi5Lo21 nOBA== 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 c186si516891qka.516.2017.10.05.03.07.11; Thu, 05 Oct 2017 03:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 9952762C62; Thu, 5 Oct 2017 10:07:11 +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 171BD60B65; Thu, 5 Oct 2017 10:01: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 737B1644CA; Thu, 5 Oct 2017 10:01:27 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id E632B60969 for ; Thu, 5 Oct 2017 10:00:29 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward105o.mail.yandex.net (Yandex) with ESMTP id B32954441A71 for ; Thu, 5 Oct 2017 13:00:22 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uXX7pgvL2k-0MNCBVel; Thu, 05 Oct 2017 13:00:22 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0MquNkVB; Thu, 05 Oct 2017 13: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 12:59:59 +0300 Message-Id: <1507197617-6215-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114873 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp52961edb; Thu, 5 Oct 2017 03:08:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB+8emhGVxrxiV+FGS0s0F+tVdNIF/KeNKyDLvEpHcoq91IJJSiCsFas/WsUfnm4hy+Yskd X-Received: by 10.55.6.149 with SMTP id 143mr12557108qkg.231.1507198136898; Thu, 05 Oct 2017 03:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198136; cv=none; d=google.com; s=arc-20160816; b=yE9M774Nwpd0a6xv8d1tgP1h2f+CPIpBrbIxVdbtpbFSHOQ9tPNyNs4qSmfNt6DYBb Jm3oLpgxyoP4bVGFpjIO6NAHUvSz7VQpQeJYctSsWuPrNI0RydrG9ADOKeyyFo5qitUH 6zWKEM5A7PKfS0X2ADvlA+SR9I8e9qB8WPIF3ulpgRNYqbiwgOpdTiFUQiE3V3cSDOxy Up3kkGwOdrcTX+0tgJMk2myZZl2+Z0qdYn4vCfGDOeFcGYeQEv2qnY79T/bfKneAx241 FLw3BqN3Yj3abrd4OACyXKrl/W2m+f/epuK5MPUwk+iAQ4woPuSyoLh1mIFszxde+Kxo 0y+Q== 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=NsUAwSfJD30bFcrWrEQ6lyq5kGi1evUwdlZeGAVpHcY=; b=VyvwRJyn0TXgk2XU5GFawb5G/HRRdy/6+taf8AVH2Z9Me/C/8/MCCgXbaWAo/83Upn WjBalx6vOkVr3VhlRlFgiWXZg4NlluAptASVhh05iKL4xypyjUObeBqNzGgvH5XwNdbF 5jD0Yla1/IUUkOnxSafSb9HuYAWUDL7PhiE+hVaVJne11C6YzNDxUQLFne3jQp4cLIhY ybMhli7TjqNwAF5pkYVZUut0bQTyvlxPkHeQGf2TgVRFyrGEz5lWjW7nV6DBSQWZDGUy sHLpMPSDL8I8PomTreTPlKxyPinhCLdf+DR7n6vDLBO/Zt5ABzYQcwuj+ziR+9RcYR0s tDBQ== 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 u184si6971815qkd.263.2017.10.05.03.08.56; Thu, 05 Oct 2017 03:08:56 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 69A2F644B6; Thu, 5 Oct 2017 10:08:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-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 DCF2C60C8F; Thu, 5 Oct 2017 10:02:03 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CB70860918; Thu, 5 Oct 2017 10:01:59 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 9D8F461E02 for ; Thu, 5 Oct 2017 10:00:31 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 5CCDD44441B1 for ; Thu, 5 Oct 2017 13:00:29 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id PILttVfber-0NKatmKC; Thu, 05 Oct 2017 13:00:23 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0Mq8ZKew; Thu, 05 Oct 2017 13: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 13:00:00 +0300 Message-Id: <1507197617-6215-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ {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 10: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: 114872 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp52303edb; Thu, 5 Oct 2017 03:08:13 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA/XvmdFUfiwEX3qEIfzh/aJVjU/IsIUs7nnzOUEYBx9u1DACcSJET6IPU/JHpXg5p4Kupt X-Received: by 10.200.36.164 with SMTP id s33mr19183580qts.108.1507198093518; Thu, 05 Oct 2017 03:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198093; cv=none; d=google.com; s=arc-20160816; b=y5eLRcyb1YzoNr588VW8z5k3DNHW6jWjR/b086XNmk1pVuAUHVvIyAGr5L26YL/KiZ 7wGDm9uON1FypAnCQT+ANGSR8SJZcDJIMgIrFy7gU2FRjC3yJ3q1vuK7D7UZelT1LULc KPYnyCVErJq/jYNT3gmRhsiRFdRy04aFzeMNVR6vCL+ntmcfnyAZfjEroPAfh5phAe+N ofUJ7pzFkvyyN/fA+30S/ey54k1Q7Dc88v0Dji1MCye1+DoBhmkpSkvvYnAQ3tKhfgRg SLfvgV1blJWaEUwS4G2dRO7H16LmKZ4LRY6e8Gxlm5T7NimkOd9y2qTlvyHAUTDBdHPu K/KA== 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=RtDOcYeDHa1fec2T1oLt8RGAwtPZif44C1kFwYP1cg0=; b=KbpAxZfRrkvCJCnfLj+08vNpdeoyYyluJ5FzxksCPv/LPQDIw0LLRk/E+JhFWyn8d6 PaPJzdTnpGH+TOTOA+3cu8fdWioVlSXQ6aXINnWvS7mUxSp7uo5F1WyejAexbjtPlEHA jOreqAKX3oaEGIUX+GHmNVZzDMPImLJi8Veha/QBRlfC9VGm0N9BZO5gwjg9yJFThLsf IAd5ndVhJAbrqk7mlBwCAzGBtXaEGjz0V+hbVSI5VrF2JkzHG8hJmu3xkNAwwC9+Bzbk 8bacIvQsBDtIIN/YItGowlM5UCw9+TFABjD2mB2Dl/2nU32c3iF8wEezw+/TjeZ0ZpHI HtGw== 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 y53si927340qtj.403.2017.10.05.03.08.13; Thu, 05 Oct 2017 03:08:13 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2471A644B6; Thu, 5 Oct 2017 10:08:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4F8B8644D7; Thu, 5 Oct 2017 10:01: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 C3A77644CA; Thu, 5 Oct 2017 10:01:28 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 2197360BEE for ; Thu, 5 Oct 2017 10:00:31 +0000 (UTC) Received: from mxback10j.mail.yandex.net (mxback10j.mail.yandex.net [IPv6:2a02:6b8:0:1619::113]) by forward102j.mail.yandex.net (Yandex) with ESMTP id B7C96560264C for ; Thu, 5 Oct 2017 13:00:29 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback10j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ixvS1dhLT5-0TiKJ8nQ; Thu, 05 Oct 2017 13:00:29 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0Tqu69Jl; Thu, 05 Oct 2017 13:00:29 +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 13:00:01 +0300 Message-Id: <1507197617-6215-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114874 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp53604edb; Thu, 5 Oct 2017 03:09:38 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCLDCR71o3falbhjNU/pT9G05m1jB/Mt6YSRdZ8TbKVcfiRyxpX44+z8CuJEMdaU6CW/N8U X-Received: by 10.233.239.215 with SMTP id d206mr14099042qkg.59.1507198178745; Thu, 05 Oct 2017 03:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198178; cv=none; d=google.com; s=arc-20160816; b=cbOyZYH9k2RPdD9CSAHIDg2yPGQaVH2NjnJtGKlohhWE71FFUE2nQUfw4shx67IkGW uVLD50ZMbWUltyfzoFiqA0ERZoI48d+T1Knv+6cnh1a6/vzmZzJlbfy5OlGgO2nHAjoC HMEurNW1V8PfEqO3NKOYz+/dCaZr54jW7hpLIh70b5kKAdrMQIVOsAy3j34QycTBvaV9 E0ryc+ERVDqUvhnX8F0nkNBBqiIRQOzMhj2nM7jGFeQWSH8AgW9vi5Zk2SyxkfxzCjY0 tPOF/FE1N4iLMBdOHhIn5oP22tfbMqK50qkp4iN/ktoU1SA+mw/YdsDdkLf9V0ksYPRU hXig== 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=3aaNS2j6mf9VOJUfHDWZKqj3qP2gcC75nibtx6wi7wc=; b=phR/zOgfDH/JVdJ3P51hAtBNUCLzaQhdkcM5+hoG8Gin53zfV4YO8aMbsMr1Ig55J6 8XdqtUmfvKqRe28qIxz3fNzPTSlHZae5aCaRzU+Iv9BWbCIO1T4gFsOlDtzGoppK75Dd rxoifz4ws+e1+7qysF2kyXhTKY71t9iDhnB79TYnKoNIX+ytmGOh/GDKEBWnlp9BvcVw uNk/gUJLLuVmi28sh1vmB18c4EMuw8MMAemydWJ9pdwbnnEgEVR9At6V9xCk48UMwHQ9 xqlwiVcXiHdLTQ1UiKQtnblJqnSOurofzvuoK+W5Hxcp5nOVcbvzBM2mcg4pcaUKXZcL 2Leg== 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 n55si2087329qta.8.2017.10.05.03.09.38; Thu, 05 Oct 2017 03:09:38 -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 5B6A5644C9; Thu, 5 Oct 2017 10:09:38 +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 41A8860C4F; Thu, 5 Oct 2017 10:02: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 3E20960918; Thu, 5 Oct 2017 10:02:06 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id A931460BE8 for ; Thu, 5 Oct 2017 10:00:31 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 36BCB1883EA for ; Thu, 5 Oct 2017 13:00:30 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Hzhr8k15Ks-0U54cWRo; Thu, 05 Oct 2017 13:00:30 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0TqOpAWm; Thu, 05 Oct 2017 13:00:29 +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 13:00:02 +0300 Message-Id: <1507197617-6215-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114875 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp54473edb; Thu, 5 Oct 2017 03:10:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAlAmwbmvF73qaqBm+a+awC5KK/H1gvO11OxNCwA/SG3XaZvyrdrDlPjCtAwns/M1FKTTyf X-Received: by 10.237.36.18 with SMTP id r18mr4438998qtc.157.1507198235803; Thu, 05 Oct 2017 03:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198235; cv=none; d=google.com; s=arc-20160816; b=IBIZXIUK8QT6sabopNaugI5BdvnTR1L+1NNhKCtfnlT3BO0K2CVRSkqR9zHmLA53+r /N5/L1JrPSn8Vzlb1i7Hs50Xysg0FVx1y6iW3FDBavknfUCc3ExCFhStmH9kMUA8vOR2 AAq8WecdOhgREHUbyUlZHrB4oxCcLQjrdKnDV4ajMPehGhBWJSnTQe8AoxZo5M66qdEX b8ivJpB5OmULZ27KW5qxJK+R39Y5zc2E2sQDxi5QmJWvORnNP1JaTnK4vpMcKAkizxaS vC8jYepQB2hi3SeyDsh/9tz8ZuktuyZplv67YCNcnwz+qja22Bctm6EOihzRLYMC3qxf s/1w== 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=RO04yzHE1qP2/EppajTPEd+aRUPdfhtxRibY8s8OmVs=; b=Q+CQ1Mx948d6Z5GXBfEk3CXrQZtyQGgYbRUiiPOJFmtYeUFhWQtjSx6ge4FzMcbs3N EzlU8xYTGmmbsyvsku0bYTnbscGBn24zn2/234ghu30XWDdfIMVKmBVNxKKs8gbZ/ALM buLAGhlELGF76QtqGX42aPgKdqyusBBU3n9Ag/ZSt0490/tz4Yrj4lH/uk1+KyrD6ZCj IgWe6do8P4eqtRAUcKGnDF6GeVN8IsUTPJaMBD8an6/McadyTFpaxDAnedzlZxbEPYGa fnaFW/s6WVJ5Wos+8mcLE0WtpqQZ1aooQOke3bU+Os9JBLSCAeOUYqk6S+s/Tt3LOMRE OSXg== 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 q72si2761899qkq.26.2017.10.05.03.10.35; Thu, 05 Oct 2017 03:10: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 54805644CF; Thu, 5 Oct 2017 10:10: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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 897DB644E5; Thu, 5 Oct 2017 10:02:16 +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 BCD7F60BE8; Thu, 5 Oct 2017 10:02:07 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 82D9260C80 for ; Thu, 5 Oct 2017 10:00:32 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward106j.mail.yandex.net (Yandex) with ESMTP id D6AF21808363 for ; Thu, 5 Oct 2017 13:00:30 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xKFFbB4PsD-0UIOi4tC; Thu, 05 Oct 2017 13:00:30 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0UqeeTTr; Thu, 05 Oct 2017 13:00:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:03 +0300 Message-Id: <1507197617-6215-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114877 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp56681edb; Thu, 5 Oct 2017 03:13:04 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAp07+ToiAJ2mJ7XDudShIpNvi0APMNo6Ce8WJOld/SlOTcWnDtLNqocVrKZoJJ7lrk6ynP X-Received: by 10.55.46.196 with SMTP id u187mr29126777qkh.174.1507198384681; Thu, 05 Oct 2017 03:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198384; cv=none; d=google.com; s=arc-20160816; b=ukvMyd8VsjARWPYCz4kRAtIvP4z0+hJ1w0zevLV7NtYl18kz+L46FpqZCKDySeHTcs t6W1CeyhaynkUz84wuZTKa3+B14M5b4ZX3ez+s54iBvVDRJq7VCryLhjZju5mARIF1qE 1aKXpxxksbaSDNYBTr1YpSKKQ8HMxyZnyJq4XlGLkySNGtJYo79XhY8l96YoUeGG7U5H Q1XhovJKUakHnX3HFbcPSiQcNGmzIVoNU1o+UUONvFWkVVUlu6qTbC7Qx2gjuMI5lFfR tvv3Tgo0SYZFmPaEpmVYc5rScW+eQE3/badcukMzg8E2CPcCJWBIAGHEPtTN1D8Cq7sC 0VXw== 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=UG0PEI+IAwL1XpbLjcbgAXaulPkqBAtWfsSisvJlDGo=; b=tqks+Vqjd7FNtJ5jC9u3bbpAQwoGDJmhZ4tg8VjBXUICx4nyraaNNv3fNhYLg7SVIT OulokMNB7qhDhop1bkxCTsv7HwESuNMw8EBYmx6MR0sc5j1+rSD7TSz+c8mUAZ1CvSir amcA9fGhq4FfnTgOIm2rRT67+WPXr9ztbOuXVDcQigcfcdFNKrt05euhcc6inAyf5Gof C92Y4sodK1AzhLX57fgLN71HlPTKghe0ystzFmbz7G53bbibq49daaRgtD+Tq+GjqzK9 3NYsUrsJBImRdGx72MMUUirxHOZWIFGF+6iE8xbubUVZLMRvsSaRujHYPC/4GO7ccXzS jZSw== 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 d5si6310478qtb.132.2017.10.05.03.13.04; Thu, 05 Oct 2017 03:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3E083644D6; Thu, 5 Oct 2017 10:13:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-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 CD187644C0; Thu, 5 Oct 2017 10:03:01 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 712BE61E64; Thu, 5 Oct 2017 10:02:51 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id DC98661E03 for ; Thu, 5 Oct 2017 10:00:32 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 67587785BC6 for ; Thu, 5 Oct 2017 13:00:31 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rZUTUJyMZh-0V8GAo6j; Thu, 05 Oct 2017 13:00:31 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0UqKP15m; Thu, 05 Oct 2017 13:00:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:04 +0300 Message-Id: <1507197617-6215-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114876 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp55996edb; Thu, 5 Oct 2017 03:12:15 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD+D7+VhixotZCp0Mn8ieiI1FWpN7IekZTykgox2d4XyMlJ/UmqcFVX13uc03t710bWvqkl X-Received: by 10.55.181.129 with SMTP id e123mr30504778qkf.128.1507198335414; Thu, 05 Oct 2017 03:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198335; cv=none; d=google.com; s=arc-20160816; b=zBcdPwpKYnw5oI9hNhUKAa72Ig1xEGXrF7RnHg3v9zCDUvvCR3kvRFDAApyUWRxptn BBQ4IgUOx1lnf3351iEdO/88j8Qfv7KF3d/ZFiuEWl8R5u6Ehew22JerF8VEg4ScjkAz 38qXbq2pLL/NpR65N1XhNMpIpxo13vBOwkas3gThYvCnPo/pf5n+iwra2l/zZLLS2Ul/ WjwO1oaKFbc8WilHCa5kCS7vLjppysFsyrMs5CSxM4cwGsXPY3lmpWhFf/uFHr3akAee Wl73CD3qNQHHuXlUFWn61ZFjr4e36MnjoiDISfzftdV+GSXzwLHIDF7EcQXuCi7n6XSJ V0kQ== 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=Fd9Z546hc/LVVm89hi4lttUnGoIDpBhCxprxpkSf/u0=; b=gp/y3MNiqqMVHSMbV1JFwn1vFXo97W56XkCXpPaaZgebm2ebZLEvKplSap39RSKOYm eN2dqs/0/bFISFsHh5PrVWOeHDxIf4qRsiChpdwlWZY5jJqqvTd2sEi0oXVCdB8Kqx66 YtMmAFG4QuvL0tTvKGhwsL1dC49tj6N7Ki+c6iO739G1LwB9MvxYtXwNbFJOzeaZ6EyB CZHxwygWllTnmYcv/UBkHjPdNecMZGnR8qZaKt+xUlkVgPXj9S6LEj/6Nf6c4M7Em7QX vT+OLVeilN2p1VjDdsRSdlBhhNt0Q/WNDTcp4Q1LP1G0KGKhR9Omyvpu25d62O7Tn3XP gPAA== 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 v68si6225555qkl.445.2017.10.05.03.12.14; Thu, 05 Oct 2017 03:12:15 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CF504644CF; Thu, 5 Oct 2017 10:12:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 394A161E64; Thu, 5 Oct 2017 10:02:54 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 57AE86449A; Thu, 5 Oct 2017 10:02:49 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 10D7261E64 for ; Thu, 5 Oct 2017 10:00:33 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward106j.mail.yandex.net (Yandex) with ESMTP id F128D18075C4 for ; Thu, 5 Oct 2017 13:00:31 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id P05LHEUpuy-0VnKRA7P; Thu, 05 Oct 2017 13:00:31 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0VqCqXwQ; Thu, 05 Oct 2017 13:00:31 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:05 +0300 Message-Id: <1507197617-6215-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114878 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp57784edb; Thu, 5 Oct 2017 03:14:25 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBL6nGTm/tIkrLxPxYD4hH5/zNNDZdlwuUTgyP0zFVikjIdrWrCngfNwIA4PcErGnRcRYxF X-Received: by 10.200.63.43 with SMTP id c40mr18139083qtk.219.1507198465598; Thu, 05 Oct 2017 03:14:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198465; cv=none; d=google.com; s=arc-20160816; b=iZvqrH1efm8u7LGWQt5m2HgKM0mq20NukyoNs9D/90JmrvnFll85NXXanQevYayuL6 f/ryNJYUTCs68M6t4GigePe2l1EP5mWpTtqaWh7SBg/HscCsePKvjy+UrkoJ4Bd0v3AN Yqp8nd4ts1qclvzvV+ZDdQ9cfXUwQjBD+ljd1WcWr/Xl1J1SN1LwJIQw+ldTZnDfVqUs wZRW5V3Z3v4PpRvnQkZ9KfKVFDOrdVw17WBuulQSeCTd1nEV0rhkaiMlMnsAMsGqtxiC WYSE1SemmmcsuT64o+koGhNZ1vNuuYAQ7oKbtHBxUfnOtLUGRuW/wQPROeiDS+w+CsOP WxHg== 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=LQkLMe5b6eQwtlYWPIhYXwOVfGh86gzj/yr1mdKpMpE=; b=WToyICYleMyYIXEx7m6WURZ9PCa8tbsuL2W51JIF1S79W+fMb+rF9dd6aIub2ER5Ko 1aquHTZ2ZgAcA9Z/VDb0sYzzPld2RnlAfYgR5aZH90EHotFWMRK5+OTW591VY5uA83NU 2gC1q6s0VSNP/c8dUhe5bRPGAGRIDzglQ4TjjAAxq27BM5V+UzH+6jP3MqsErg+J0H99 luWW/MI7QRjRh2H6SzzaZsluNnlwFZn7g7Y6X1+ulJbWnI4HhK1CjwwcRxOsSEpBQJJ3 iWvkt2obcHXyXh93O6wXatyVumkL4qVZQA4h1TTYtf45SrMpk3juYDBS3Qgik9EfOVEu lOwg== 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 r26si3262750qki.149.2017.10.05.03.14.25; Thu, 05 Oct 2017 03:14:25 -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 3B64F644B6; Thu, 5 Oct 2017 10:14:25 +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 1C4B564492; Thu, 5 Oct 2017 10:03: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 4D3B7646DE; Thu, 5 Oct 2017 10:02:54 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 1EDDC60C17 for ; Thu, 5 Oct 2017 10:00:36 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 7967C5A03585 for ; Thu, 5 Oct 2017 13:00:33 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cA18QZqBmE-0XGKW1uu; Thu, 05 Oct 2017 13:00:33 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0WqKoOHm; Thu, 05 Oct 2017 13: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 13:00:06 +0300 Message-Id: <1507197617-6215-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114879 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp59027edb; Thu, 5 Oct 2017 03:15:56 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDjb24F0oAJ8IlbfQdRqYRpVi42Aj2HkWxD3XIy+UeVuhuMC8/Wmlwj1vV5NAoWhZQVDtKE X-Received: by 10.55.166.77 with SMTP id p74mr30801qke.264.1507198556806; Thu, 05 Oct 2017 03:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198556; cv=none; d=google.com; s=arc-20160816; b=kAL9XZOS2dp+vMg/sxP0WDb8BahBOrWJBl+pFc8iNLZ650+/WYVNsobcAboIW6cO1m ILwNe9/FJepsLf3VO1C/Spq9asN6OnEKB5NlsJ8aRvLRrAb65KQ1amaJEDqegJra5+fO ODzhof++xcROgek7MvA8cnqoChbPtQSwx+H3gk92oXuR9ZsfUiOb8giD4yp+SGo+6cyF otOFDE0X+Datexn4O6uR8KNNsxraf7U/+QB/TdkXCy4m3/iLdsivefcyS0K6/g4TQiax gv4jJ6kLewAGPfYIFZCR94ZSsQJLcDyDl1GJba6/qPAcus82btjPIITC1sbqIMuihR7Q VYsw== 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=vh8jXvxSnrW90XNb13BTrVqbNE4/Z6ZaDFPLL8itAyg=; b=xoLAqYMj/qXXhoycJTBS3ehAXazjVvj85mStmmlO86axKT+lAXjwF5d81xZcN59tYW RqPn0R6xU/ai9o2dQVjt5u+269WiDK9xPujbT0UE9tL8KrirHff/gG0xdQzWvF+wShBv 0l0S37zuZvDEP95+mXSiWOFjq5iZopJwv81+mIosvl/njJ2CdOX7pBc3GqgtvNLJf56E +Si7EDAiJ5o84TYGtk9LuyBy4BJjQt3CzGFcgqBuyH+MOFuZDSeWcoRN/mxycUEqhRsx oNvStcZUK9At0HrneAtd42SKtGF0TJPxaKbnugdfqp9uJ/l64/8lau+i6pVgEi8eqmN+ m92A== 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 16si1239157qkd.358.2017.10.05.03.15.56; Thu, 05 Oct 2017 03:15:56 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 7457B60BE8; Thu, 5 Oct 2017 10:15:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 65EC6646DE; Thu, 5 Oct 2017 10:03:23 +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 37302646DE; Thu, 5 Oct 2017 10:02:56 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 7622161E19 for ; Thu, 5 Oct 2017 10:00:35 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 7306634C5AB2 for ; Thu, 5 Oct 2017 13:00:34 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id i82rWRIMiK-0YDSj2j0; Thu, 05 Oct 2017 13:00:34 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0XqW3Juj; Thu, 05 Oct 2017 13: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 13:00:07 +0300 Message-Id: <1507197617-6215-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114880 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp61254edb; Thu, 5 Oct 2017 03:18:50 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAdrddzIWp4Xe7Lyrkw0j6CG6/d+znDuDB4v9bQ/FwmnBGkML4c69gYuxQMdOckEYrVIfWE X-Received: by 10.237.59.180 with SMTP id r49mr10239005qte.70.1507198730777; Thu, 05 Oct 2017 03:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198730; cv=none; d=google.com; s=arc-20160816; b=ohaKA6bpSvCPsXeD/6a2KK0LSEo8rEnyRfZRAV/LFjeErqVIstYRaB9B3WObLpN1HB xUfGuWoS5TubZwaZ+MMiEX6FiJrU7x2CDinVtR2XTppQeU8WrBcTN0S8to0G95GuzdFk UWFF89GW1/r5JkYB8kihNjA5GPGP3GHiM+buVxsOE69k98YaSBTb2vT4hCkRviwkpR22 bjCtlKO0iJKfqgWji7k8SHcOoZtHijzNawveEru6okP1IzlYGaoUVbiAH8i0QA2JCqDA Fe2jFSGIklzYKjQ/6hkHLqPfO1SwK32I/dc6dsgm4MN8MtFjjexKMwfAcTWINIcWj5UI +uLw== 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=VCGHFs91o9L/v2ddhCjSjgSG5SbzKf6ae4lqWq8O4JE=; b=ZjYcA5ULJVYdV/jsKBKfYojfoqaM6P2DNBDw25n6JGaEmNKwlKJNpptqf23QWxwPIR U+U9e0rRwv5/aZRDhMUzk14zTm8I9/N/+gDO80tHxoBmJqa6+N1ZuBKCN9V7LD38GY9a Fu9Q2od+Dg3tZm1tIZDKJ90g4SBmWg11Ick2rx5j7RPLQ5DzxgW+IuiIRjcwqcPUl81g tuTHTJB3kzYIulpcpBKwL1S/2nBZUwVBBElw5uW290+MLqoaEhHQ7S4cSGrbv+7aaTYk ChfmHclOfuAiuNQDPpeW/3Q3R2HkJdrdq6okMGF6HjdE3P0l2CiNN6/QRv/9OAmFe8CD H++g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 30si14724482qtb.110.2017.10.05.03.18.50; Thu, 05 Oct 2017 03:18: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 5E38F644E6; Thu, 5 Oct 2017 10:18: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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 55E8F65897; Thu, 5 Oct 2017 10:03: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 F22DF65BB7; Thu, 5 Oct 2017 10:03:35 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 185B262C59 for ; Thu, 5 Oct 2017 10:00:42 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 1824656061EC for ; Thu, 5 Oct 2017 13:00:41 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uaDrqoKGBr-0ZSWwwel; Thu, 05 Oct 2017 13:00:35 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0YqimvnP; Thu, 05 Oct 2017 13:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:08 +0300 Message-Id: <1507197617-6215-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114883 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp63130edb; Thu, 5 Oct 2017 03:21:22 -0700 (PDT) X-Google-Smtp-Source: AOwi7QARjnvqlpjeqCHQ3nLtVPrMJ9iwRFb1iVe2pQLQ+D8rphbOYL90kpL5+ECKEOx+CUaDSZRg X-Received: by 10.237.32.172 with SMTP id 41mr32196286qtb.213.1507198882565; Thu, 05 Oct 2017 03:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198882; cv=none; d=google.com; s=arc-20160816; b=brKmjiXsT/s6Qspwe8zs56KpqrCn0usgLXasM4BcURbSm4yGKC5hyLVwsOsq/WI7Bb H9aEf4Z0h/NFui3Q2aMlXYONZFDU/Q4TRTKlGnXl5tekpIwCWErsC91SITJ0uy8c5hhV Hn2kg1/Vk4cEkrIPHQ+toleJVyY3UGNXS7kpu6odhVyONGL+enyYTrqCFQGnSXLCpcSs CrdjgNRvjMfo2GVDlc4U507QUyXTZx9dIdxnBtBvv5XJFxGOclms2BEV/gUEnzj3WMU8 g34Vuen5pZH5jTySR8xF3XcynyoaSQnGV2C728ztsPvtIbOPLD1XJN+a7Tt1+wMY5ySC Waqw== 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=SQnhefZ4ZBfuqU87a914l6OTswNuOSV4T6CcDY0B9H0=; b=MZXnV0VcevFEV68x1ZZ88Cbjb9sKV4qY5DNi6F0SOivA4SP8o88FlGOZnMxVbAo6qs oW+k4bK/hBsw8oQMx2mt0Q53LOEpo8EC6UvRLx3b+Pt4scbFUPJikuNmj+m9ZYKgxx+0 1plWaz4S3YSYbLhN/kNwewzY/kWHiQVVEUHmJo7EwiyE7uur8913Lz/o2MiYM/EvtZMn 4UpoABPDW18IVhUg8kuNv5YjcGv2AeCkWIpWYbsACwAMJTxUofLPdoQqkrl2jYNDBG65 2FXtKkehQXY59f7OlY4jL3NWuLvB8DLlJeyL0jB2rod7ZurQZYMG9JcLNEfWBlVO2DzS OmdA== 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 u129si12658898qkc.368.2017.10.05.03.21.22; Thu, 05 Oct 2017 03:21:22 -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 2391E62CFE; Thu, 5 Oct 2017 10:21:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 43F4465BB8; Thu, 5 Oct 2017 10:04:14 +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 CFDE765BB9; Thu, 5 Oct 2017 10:03:45 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id B206960C2B for ; Thu, 5 Oct 2017 10:00:43 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 6A301701D2C for ; Thu, 5 Oct 2017 13:00:42 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id z6WRIQwIER-0gNaPF88; Thu, 05 Oct 2017 13:00:42 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0fqCMHE2; Thu, 05 Oct 2017 13:00:41 +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 13:00:09 +0300 Message-Id: <1507197617-6215-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114881 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp61777edb; Thu, 5 Oct 2017 03:19:30 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDny2UEr9u65O4H2qyHAdHLRWrhDtpR10EzsriON9nGCReS8d/aaKpiqgv66W7rFXmqqJJi X-Received: by 10.237.37.103 with SMTP id w36mr24035945qtc.325.1507198770657; Thu, 05 Oct 2017 03:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198770; cv=none; d=google.com; s=arc-20160816; b=KQb1/F77Qnzjp2/W+hJjPaagWFwfDnwo2Wleyh3Riw1HAnS2gBE0OQcLa2r+DB3VdS G/dc5LFy+7z7rj9sE6winxqSzAOXunyIAOhXQRwTr1ljSBnQuTsuD6iy00CuixCPsfu2 +xaAoAqNeouVhzn0OTl1ubJCYPdKajadoj/oQ19570y48MxINgeU1eRn9QzkPt9G2gbB VenQH3DRj/KxVhXOSDmyr+wb03MVH6C7g+2ce4S+UIX34dM6bG9yQfcZ1db2eBM6OHS7 a33U0pA4VqLlNf4rq8uFXiY53jPj2Ee6eZsbmhBgMspcMG8cUoW/HuI+E6HQ7fevg6nc +FMg== 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=sDOz5VhfXekia2CIPBtWsl70DZgGH4hzGkvvRBXyFVk=; b=AWAku2YtykUh48dodcrjc8Os/EfiuzK89jMIApjGOlifAqFzqEDtQMawB8UdrzlQNZ i/FN0cvzRnTZSOf5jYf/gC+dRwgDGVJOdXApSs5TCVQjrxsOYEpQnFPOM0YDVT7ZqzU8 vU1J3kSZIJ1Ya2mmr8klb3ksH00t5SXyayzm/fpXKpRe4REtsUK2Gc/5QdDgpmnLsxgT pcwdGigMD8bU7KRDxwnro+y1VDvIU71HOE4twYrk/aztzMwzWNIHHEMX655/A5gazvg/ b52M0rM63jDcKW/eRCxfOVmBBZ76YjW+Fvp4q6RSNOy94lmaqZ5tFQF8F5wONFbXMmBc Kprg== 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 m22si107478qtb.194.2017.10.05.03.19.30; Thu, 05 Oct 2017 03:19:30 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 532FB644C2; Thu, 5 Oct 2017 10:19:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 9A20565BB9; Thu, 5 Oct 2017 10:03:49 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8A2B065897; Thu, 5 Oct 2017 10:03:42 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 4181062D06 for ; Thu, 5 Oct 2017 10:00:44 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 35AEF34C3E7D for ; Thu, 5 Oct 2017 13:00:43 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rBnkbyR9SO-0hNe8hdW; Thu, 05 Oct 2017 13:00:43 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0gq8Xx7o; Thu, 05 Oct 2017 13:00:42 +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 13:00:10 +0300 Message-Id: <1507197617-6215-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114882 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp421878qgn; Thu, 5 Oct 2017 03:20:17 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBrzJOv/ZxCpd0zWfmAu/ds8zx58xZf2J+uZS9SNW5omXtWhiHuDPahYXDCU78R9/cEYcfX X-Received: by 10.55.38.129 with SMTP id m1mr24494525qkm.75.1507198817013; Thu, 05 Oct 2017 03:20:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507198817; cv=none; d=google.com; s=arc-20160816; b=H51thGtc3gMduSi9LWsMkpEIYvOQdO0uNiP6irEacegB2HBZkRyYGKBGmE601WoAO2 8MQxEYNf9TeADTc4jemfKZ4bfvIxeK9puH2gOcTR1xk88tRfCDgEM3r/jP1FBGXKQ2jd b+/flsKTy1mElw6jei4foCsO3D0Mj2dXlaV8wB6umXJH9PWvhwx8cJUT+3gGBl1WY3ww 4xDn8us/P29L5uMz4+SIObNxlWMo2+0U3N7zA6mD7YWcc1CaOv70GWyFG/XTVqdGmAAC nmDlaGcxV69WV8Ny7Dg3XuId7TFCeHjnOadHzwV+BE2Arh9NkVl2abYyLFhl+QxS9ySY C23g== 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=OzqCRJY8gFhY0jGLdlUKv60X0VYE09/3C8TPDfzllEo=; b=VQlKswK/X6mVW8rMwrh6PZ5oQGQgEH3UncQ4W1DyUtloY7IDylTvjjAShfMYx73w5r 3GfOrCWhIvnPMgE+aTVoF1xRLJA7rSTs51gRmv9YOuPxzZ5tPMfDJpCH/FM48Ne3R0Ww s/Obpv1vNGMj+5M0GnAqLdKwpyFjom+oKVe+HSzi0MPKx2Umusw3Vj0cVHCbLC5hAs63 MgoelR1ZwMymdYnvOtZk6CD5OwGwHN3eIezRrwENvZ5loPLirK1xz0h4wv5mKavKxpkX +eXtgdD12A8lu7OqHp7N9EdHxcL4vpyAALOD+WR3kkTahJZtj8mTZ3BTPaQem+d7GEN2 geVA== 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 c186si533324qka.516.2017.10.05.03.20.15; Thu, 05 Oct 2017 03: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 C46CD62C59; Thu, 5 Oct 2017 10: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=-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 E794165BBD; Thu, 5 Oct 2017 10:03:55 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B8B5F65897; Thu, 5 Oct 2017 10:03:43 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 30E8F6449B for ; Thu, 5 Oct 2017 10:00:45 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 0B9B12D8483A for ; Thu, 5 Oct 2017 13:00:43 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id d8tOdduqEb-0hfeH5Z4; Thu, 05 Oct 2017 13:00:43 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0hqCxd3G; Thu, 05 Oct 2017 13:00:43 +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 13:00:11 +0300 Message-Id: <1507197617-6215-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114884 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp65982edb; Thu, 5 Oct 2017 03:25:12 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCNlJwiOOZP5qZ4s+lJNIKpps+lILdlOwDxF/ZnCoaVnRkpjUAJlZjLIE8N2U127vo74tdk X-Received: by 10.200.37.65 with SMTP id 1mr16987550qtn.83.1507199112310; Thu, 05 Oct 2017 03:25:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199112; cv=none; d=google.com; s=arc-20160816; b=YTkk0NTNhbJyYFl3i+xwy28I2MRq7twea5peRXcO2UF8UjrObj8/lDOa5mkU+qirFt qrvvxm5WfAcKrVtAy3Ute/2J0QTEac3ttSisDSWvf11TMA9OhmBDB4lYhPcKtbI2+Uub NGYV/EaDpi8Q+JUs+3mJ4VKFbjI3XGiAr34mt6WU0RJUYQnU9PPd31WRUDV0TwUpLrMl YZ+YQ6ICtd0JsdL3jlWnxQ2FXpS0Be1pdqLuij4fAmzDy84e8fA0H20eecJZOQ4IiWc8 0JaCxRoM6gfG5/WtPOszCgld12FUbnTw6AGZj7e+RMckhLfqimOHxrtnSWhhBB8CylVL RkHQ== 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=+9ARXuuvIQfEwzdA1D4mhw4ZoGW6iLWJibAVq/YAtn4=; b=KcJ9Ko4ChwOI20mIPj+/TIK0gmEyS12VmQ5Xy2TGbn254Hqim3dmatpX0fSvY/Oj2N H9m1wBjYkM5JzYkiaXbOuVLnZMGdsJp+Z7AY4pJ2S5GPxpuJKKwLkWoA3vf0aWkNzlAl d6QQfOrJZpfsF+evnaX3VivUR3bdpYlIkqzpWIxVAT4CrEy0yMoKw5IaR8BVSsX9qsFv iONyM0+wIsC8rksSvQSCP4SITXN4qo4Gdk2/YgjiM1285EYCaKLWdDfNehH09/rgVQO8 ECL1v0nGjUrnv19Nh+FRL5aJCY4NviG+dRsJQ6HSe/gf1GvHFXXaV6Nank060ExUyMWw hljQ== 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 j189si3118418qkd.350.2017.10.05.03.25.12; Thu, 05 Oct 2017 03:25:12 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id EBF20644FC; Thu, 5 Oct 2017 10:25:11 +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 A917565BC8; Thu, 5 Oct 2017 10:04:24 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6499E644B6; Thu, 5 Oct 2017 10:03:53 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id CDCA3644B6 for ; Thu, 5 Oct 2017 10:00:51 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 9F66D6A86A5D for ; Thu, 5 Oct 2017 13:00:50 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id i1hGjs6zo5-0iSaqDpk; Thu, 05 Oct 2017 13:00:44 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0iqK49eo; Thu, 05 Oct 2017 13:00:44 +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 13:00:12 +0300 Message-Id: <1507197617-6215-16-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114885 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp67840edb; Thu, 5 Oct 2017 03:27:47 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD+BHIg7BTN9VvKVi+4W7ZHVmbJ9Yk4aR3V+3IS1aB9w2AiMS0PwwsdUUVWVp3d2zZD/UYK X-Received: by 10.200.6.13 with SMTP id d13mr23852562qth.217.1507199266797; Thu, 05 Oct 2017 03:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199266; cv=none; d=google.com; s=arc-20160816; b=KR+JDmMxh5+db8qq3CkBYrbo2HXNfAlrTCyMy7kq6xasRSMSsKpFeG28Pp7A4Vzjh2 7K1FDENEf+bbVHhIFrB36kK6f4JE7ex8Do98IkTIaRfNyzVMlVdG5uqW2OQC2VzvvxZH gJEUU7bMmYcS3jV0V2epn2UHAgfjYu65W2Qc4CXJGlkfRKWsks+Jup1VyIu0rBY88KR+ /zpAFK4xSOoM2HBKSQpoMOCMWSmKiUVcQ4NjXn2rL2cTw//JJOLFlYcAsGONcCL5cP+8 VZkAPJ05jF7I96l9OFEtiHmgHhWQXQcaVewwJeSEmFV7aNqAyoYFfrAqhFZCInub0usJ vweQ== 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=yUqcgnOFipMeKRtikuvNPQpjx2KoNFasXwuZcK+CBHM=; b=j4iKMoYsuk34hg5MmdvcC4gPV2Dvy+YvdSCthUSTh1mXy1clzxju12OUWmjJ/v0x8X 6dWY6M/jrahpJ8nRKA/j6mBSfmWh15UrJZ8IUj8oPqITX0/2agarTC3vQDqr59HMHvMA tVqt74XjjH2D1mMxgDwDL8gxFfzndS+UnX57/tckAHUfZEbjHYy+OZVhg5MfsUfQl//7 75mBJmb/9Yw2neI87BtQgkDHiF7z+le8zwrY+8d3xrx0EOgEYy6/48aVJYxH992wS3mK 5tmrlUdBpqk+03hZrIwM8pbAmkZvN9ySIApGIGY4nIjErpek3K97FugoVMHlm1ZH4Jx3 nOSQ== 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 5si837630qtq.459.2017.10.05.03.27.46; Thu, 05 Oct 2017 03:27:46 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 662D165BB8; Thu, 5 Oct 2017 10:27:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-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 58C28644B1; Thu, 5 Oct 2017 10:04:49 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E8DA6644B7; Thu, 5 Oct 2017 10:04:41 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 5CC86644B7 for ; Thu, 5 Oct 2017 10:00:52 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 5B7A713430E8 for ; Thu, 5 Oct 2017 13:00:51 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DFEPjok6Pi-0p5WVWvV; Thu, 05 Oct 2017 13:00:51 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0oqiRhU8; Thu, 05 Oct 2017 13: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 13:00:13 +0300 Message-Id: <1507197617-6215-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114888 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp69815edb; Thu, 5 Oct 2017 03:30:27 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD9jAt3R5Bl3Seu85dTLIQ1vZCsmuvmSa8saDrWY7EbFrZ93IUKhe3WjXBy/izrB1uiHRiu X-Received: by 10.233.244.74 with SMTP id z10mr304134qkl.31.1507199427608; Thu, 05 Oct 2017 03:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199427; cv=none; d=google.com; s=arc-20160816; b=G6dG+N8TxrTdYccaapoAfFO7CmKKV/4Tpn89yduLW+gUyFm+AtLT5CNerVpRhmX8yz Wouzf3Ceagv04KGHH4Da+3t3BW7uUHRJW988R3F++v66xlOvoKzeRuNo1cWCkl7rvVhs MZi59wArH+00dINPv0uQ0eRiuo37+TBEoo8r7XoI0k4zb/JERVXOKX9qOfFxxvy3vmp3 weA5dpPW/KpzNEm0FMFw+hhPQaDmlHt5Qdtrvzy+yeNgPmaqKsaWCVSXw7zSZrUlqbZU jkIKxZORnM2LgNyG6k7DSKrDF0eIqD+ieQ1Xk6g28W9lgSPQtWFFLH6icR6OwkgCz4mB X2CQ== 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=0Aqms0vtRSoCX6YDZMGzhvxCca069FqSGX34mZ5/cKc=; b=ZlmWtx7eUnkGVrQwBnBlXUVrp4CiTtgoWOC3IWVW4nyuZVlB+7NN7sKnrn7BjVR92R Lcsd2dMEQhBmMy2AIQ9ky1BtTfJOMG/dKS0giM6GhJdwrUrYXumB6doCjBPnRpfKhK7+ GnOhpGRcia0xdJ5/sucU3jfpOSIXqiwDGMfgboA4WAGstx5tOTWuXIwKqi/Ws8dJhkx2 NeT+9hfWs8lnxdb82sY8PgroLiDQz480puMqr6a7iJRWqUB/LqBXlgYbD0Ls03GijHxZ Iit6va9OJHrrWFeLN/7UJoFvbsy42JxWbsFdEdnKXaaPU9BLvac+8Y5iuzK+aX6G4Yyh nZOA== 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 d16si6846914qtg.57.2017.10.05.03.30.27; Thu, 05 Oct 2017 03:30:27 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2B8CC644C0; Thu, 5 Oct 2017 10:30:27 +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 531F865BD2; Thu, 5 Oct 2017 10:05: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 CBB8762AE3; Thu, 5 Oct 2017 10:04:46 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 3585762AE3 for ; Thu, 5 Oct 2017 10:00:54 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 2137F2D83F1E for ; Thu, 5 Oct 2017 13:00:53 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ph26xkpZiO-0rv86NJr; Thu, 05 Oct 2017 13:00:53 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0pqWglX8; Thu, 05 Oct 2017 13: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 13:00:14 +0300 Message-Id: <1507197617-6215-18-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114886 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp68481edb; Thu, 5 Oct 2017 03:28:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCxIf/qOWl3ZNm4u02cwYP3tzFiFSGpBql06OF5TNX0i6Q1hUJvBau77aSaBBGfwCBbqoXn X-Received: by 10.237.46.98 with SMTP id j89mr35077914qtd.182.1507199321049; Thu, 05 Oct 2017 03:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199321; cv=none; d=google.com; s=arc-20160816; b=nO6v3LR6ihnSA+5OBo8tTiOtfHl8ESYrf3I3OSczrdMJh7jcc++vwlvXgjN+y6qH/e 9aHGaJbQrDtR+Rrw2wIh1VODWxJyqY0Crhrgw99OwlL4Jmk/0WoRUY0VSMir+JSH/Y7C hEAOLcdT2PPXBLmPjHxGOg9dpXY0gcp2+uR1q2DwRVzfkw7vf93FqcMqcAsM6I7uBiIT GdS0BLFiLlTApIoNzY+2gacE/LGNzD2T4DQfnI+OACTTnus1E4O3AC1elench13WdB3C A6esjj/hrMpGI408ra+M1086CsRwsY+SI+b8QBcLUULooWjavFsEpaZbNZaXYeURL7xE dnwQ== 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=NgRKpFaPoCcA2Km4BjrRhQEUHNkoSHFpJ9G+wkaup1g=; b=omRr1GFif+F1m2vYWk2PMtqW3xr4LJpy8lxrV6OFR+DeJ+f1zPyLXqoDNmEuHnhcWv 72Dd2nBpUjI3dwfsFhR7lXCKrOsSRr7M7pmfoPbNtiee4uA0G9ZQ9wPqAGnHqGWD/ASG L6DWobjGmtPIoF7rxWDo2sns9qy4/vgg2Aki66oSxmso8HImUm3eNfp7uRvtuP5Hu+hZ youMsCP4xdjP9+nJ6FIkIvECHt+6UO49aM3OeiXkDzwzvOYHGr0SAEasVJdySmunO+ha 11vgGzZ7kyw1FWehD20Q1LxWB4dWSqncwEL8Yj+HnALEl7le0iFP5TBeZCbH48i18PNn oNHw== 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 w61si406848qte.466.2017.10.05.03.28.40; Thu, 05 Oct 2017 03:28:41 -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 BFDEC61E02; Thu, 5 Oct 2017 10:28:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 8ED6765BCE; Thu, 5 Oct 2017 10:04:54 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9B593644B7; Thu, 5 Oct 2017 10:04:42 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 0168D644BF for ; Thu, 5 Oct 2017 10:00:55 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward105j.mail.yandex.net (Yandex) with ESMTP id A5EC1185E9A for ; Thu, 5 Oct 2017 13:00:53 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id QJcKZVhvv8-0rjafZDk; Thu, 05 Oct 2017 13:00:53 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0rqKJC1O; Thu, 05 Oct 2017 13:00:53 +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 13:00:15 +0300 Message-Id: <1507197617-6215-19-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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 10: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: 114887 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp68906edb; Thu, 5 Oct 2017 03:29:16 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAKpYomBCI7herx/pwfhV+eVbt97N+Ih5cquQBAoSqrv/3vT+rf/sZlfduCwe98QWOZPYJG X-Received: by 10.55.185.67 with SMTP id j64mr2553577qkf.37.1507199356086; Thu, 05 Oct 2017 03:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199356; cv=none; d=google.com; s=arc-20160816; b=v0yXf2TjQgbc4DWSTJ5Ta2nH04jShK+5jXTAtKlQFUIOL7pEFp2d6xlrFWj87G8NLw w+b2LEj+t5gSKML3qfClYwFvznlL91cXGM/rBJJddDG1dEbidrmVbqIP6WU6VmJWHr94 6jLTaO8AdoTD6K0t60O2lgm700OT6151MmYpZftDodgmCmVumw2F5gDBWZJUihSgzUbe kwaKp03Q9vdEF+F2ECONm6IWkQwtmS4ZGeV3QTYuqACSmdTd56mzZcoKNP77gx4l+HQn Sk8Y+zYDnmJk/XL7igKr/sJMWm1J66pOW1LczoKsdVyqO+GacdU/QosN4VrYcj0X/nSb SENw== 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=a7srxZkuZVO275zviKSBz0kqwMA1rnP6Ew43SBA5908=; b=VcIfKz+56QnNsJRC17qrpq68gNIo+Mr6Z05E7qNCJyrg9V2zBzyRbR+crMO57b/JPH obH3EoRzWyYp91VksXnkg+9Y5JnNGSy4mhzcpyZxntnxXHE9B13E4YlzRDDScxSy4XJf yKw8Zi/z2lC2sNGI2+EKHoPzZuEj+L7/YC1ybFmWesK1yul0PFUj5q+mgikhGlynE0UB 8K75Uypjm69avaJJDjDNxP9ZR4HwQDDSshdWxwZQBpmBHWM39aD4SMR0RW6TrJHpQ5om 4hbOEf5SBdK9ipn8u0H//agXV1gYjWNVo/CvjlJgxqsMVj3FMcxasxPBTBBtJicNUYsi 77yQ== 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 q63si3821221qkf.15.2017.10.05.03.29.15; Thu, 05 Oct 2017 03:29: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 B012A61E02; Thu, 5 Oct 2017 10:29: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=-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 E034565BDC; Thu, 5 Oct 2017 10:05:03 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1C7F46449D; Thu, 5 Oct 2017 10:04:45 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 59303644C5 for ; Thu, 5 Oct 2017 10:00:55 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 4DEFF7043FF for ; Thu, 5 Oct 2017 13:00:54 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 79iuYQ7Nf8-0s58UMsP; Thu, 05 Oct 2017 13:00:54 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0rqaVkeX; Thu, 05 Oct 2017 13:00:53 +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 13:00:16 +0300 Message-Id: <1507197617-6215-20-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ example/Makefile.am | 2 ++ example/Makefile.inc | 2 +- example/classifier/Makefile.am | 9 ++----- example/generator/Makefile.am | 9 ++----- example/hello/Makefile.am | 6 ++--- example/ipfragreass/Makefile.am | 27 +++++++++----------- example/ipsec/Makefile.am | 53 ++++++++++++++++++---------------------- example/l2fwd_simple/Makefile.am | 9 ++----- example/l3fwd/Makefile.am | 15 ++++++------ example/packet/Makefile.am | 9 ++----- example/switch/Makefile.am | 9 ++----- example/time/Makefile.am | 7 +----- example/timer/Makefile.am | 11 ++------- example/traffic_mgmt/Makefile.am | 6 +---- 14 files changed, 61 insertions(+), 113 deletions(-) diff --git a/example/Makefile.am b/example/Makefile.am index 9503a1baf..695e029c9 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -10,3 +10,5 @@ SUBDIRS = classifier \ time \ timer \ traffic_mgmt + +noinst_HEADERS = example_debug.h diff --git a/example/Makefile.inc b/example/Makefile.inc index cba385b77..12edc46c0 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -11,4 +11,4 @@ AM_CFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include -AM_LDFLAGS = -L$(LIB) +AM_LDFLAGS = -L$(LIB) -static diff --git a/example/classifier/Makefile.am b/example/classifier/Makefile.am index 0c66e145b..a0003e9a4 100644 --- a/example/classifier/Makefile.am +++ b/example/classifier/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_classifier$(EXEEXT) -odp_classifier_LDFLAGS = $(AM_LDFLAGS) -static -odp_classifier_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_classifier -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_classifier_SOURCES = odp_classifier.c +odp_classifier_SOURCES = odp_classifier.c diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index 49a74978a..7deeef406 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_generator$(EXEEXT) -odp_generator_LDFLAGS = $(AM_LDFLAGS) -static -odp_generator_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_generator -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_generator_SOURCES = odp_generator.c +odp_generator_SOURCES = odp_generator.c diff --git a/example/hello/Makefile.am b/example/hello/Makefile.am index 2e4e0cee5..a2d976015 100644 --- a/example/hello/Makefile.am +++ b/example/hello/Makefile.am @@ -1,10 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_hello$(EXEEXT) -odp_hello_LDFLAGS = $(AM_LDFLAGS) -static -odp_hello_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_hello -dist_odp_hello_SOURCES = odp_hello.c +odp_hello_SOURCES = odp_hello.c if test_example TESTS = odp_hello diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index f805a69ba..fa7d5c8bd 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,22 +1,17 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_ipfragreass$(EXEEXT) -odp_ipfragreass_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipfragreass_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_ipfragreass -noinst_HEADERS = \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_atomics_arm.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_fragment.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_helpers.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_ip.h \ - $(top_srcdir)/example/ipfragreass/odp_ipfragreass_reassemble.h \ - $(top_srcdir)/example/example_debug.h - -dist_odp_ipfragreass_SOURCES = odp_ipfragreass.c \ - odp_ipfragreass_fragment.c \ - odp_ipfragreass_helpers.c \ - odp_ipfragreass_reassemble.c +odp_ipfragreass_SOURCES = odp_ipfragreass.c \ + odp_ipfragreass_fragment.c \ + odp_ipfragreass_helpers.c \ + odp_ipfragreass_reassemble.c \ + odp_ipfragreass_atomics.h \ + odp_ipfragreass_atomics_arm.h \ + odp_ipfragreass_fragment.h \ + odp_ipfragreass_helpers.h \ + odp_ipfragreass_ip.h \ + odp_ipfragreass_reassemble.h if test_example TESTS = odp_ipfragreass diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index fd9b3c722..46613065d 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -2,35 +2,30 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) -bin_PROGRAMS = odp_ipsec$(EXEEXT) -odp_ipsec_LDFLAGS = $(AM_LDFLAGS) -static -odp_ipsec_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example - -noinst_HEADERS = \ - $(top_srcdir)/example/ipsec/odp_ipsec_cache.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_fwd_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_loop_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_misc.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sa_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_sp_db.h \ - $(top_srcdir)/example/ipsec/odp_ipsec_stream.h \ - $(top_srcdir)/example/example_debug.h +bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in \ - $(srcdir)/odp_ipsec_run_ah_out \ - $(srcdir)/odp_ipsec_run_both_in \ - $(srcdir)/odp_ipsec_run_both_out \ - $(srcdir)/odp_ipsec_run_esp_in \ - $(srcdir)/odp_ipsec_run_esp_out \ - $(srcdir)/odp_ipsec_run_live \ - $(srcdir)/odp_ipsec_run_router \ - $(srcdir)/odp_ipsec_run_simple + odp_ipsec_run_ah_in \ + odp_ipsec_run_ah_out \ + odp_ipsec_run_both_in \ + odp_ipsec_run_both_out \ + odp_ipsec_run_esp_in \ + odp_ipsec_run_esp_out \ + odp_ipsec_run_live \ + odp_ipsec_run_router \ + odp_ipsec_run_simple -dist_odp_ipsec_SOURCES = odp_ipsec.c \ - odp_ipsec_sa_db.c \ - odp_ipsec_sp_db.c \ - odp_ipsec_fwd_db.c \ - odp_ipsec_loop_db.c \ - odp_ipsec_cache.c \ - odp_ipsec_stream.c +odp_ipsec_SOURCES = odp_ipsec.c \ + odp_ipsec_sa_db.c \ + odp_ipsec_sp_db.c \ + odp_ipsec_fwd_db.c \ + odp_ipsec_loop_db.c \ + odp_ipsec_cache.c \ + odp_ipsec_stream.c \ + odp_ipsec_cache.h \ + odp_ipsec_fwd_db.h \ + odp_ipsec_loop_db.h \ + odp_ipsec_misc.h \ + odp_ipsec_sa_db.h \ + odp_ipsec_sp_db.h \ + odp_ipsec_stream.h diff --git a/example/l2fwd_simple/Makefile.am b/example/l2fwd_simple/Makefile.am index fe2065452..f082335ef 100644 --- a/example/l2fwd_simple/Makefile.am +++ b/example/l2fwd_simple/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l2fwd_simple$(EXEEXT) -odp_l2fwd_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_l2fwd_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l2fwd_simple -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c +odp_l2fwd_simple_SOURCES = odp_l2fwd_simple.c if test_example if HAVE_PCAP diff --git a/example/l3fwd/Makefile.am b/example/l3fwd/Makefile.am index 21d0cf1a3..9a48ea173 100644 --- a/example/l3fwd/Makefile.am +++ b/example/l3fwd/Makefile.am @@ -1,15 +1,14 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_l3fwd$(EXEEXT) -odp_l3fwd_LDFLAGS = $(AM_LDFLAGS) -static -odp_l3fwd_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_l3fwd -noinst_HEADERS = \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_db.h \ - $(top_srcdir)/example/l3fwd/odp_l3fwd_lpm.h \ - $(top_srcdir)/example/example_debug.h +odp_l3fwd_SOURCES = \ + odp_l3fwd.c \ + odp_l3fwd_db.c \ + odp_l3fwd_lpm.c \ + odp_l3fwd_db.h \ + odp_l3fwd_lpm.h -dist_odp_l3fwd_SOURCES = odp_l3fwd.c odp_l3fwd_db.c odp_l3fwd_lpm.c if test_example if HAVE_PCAP diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index af729b098..228c3506d 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_pktio$(EXEEXT) -odp_pktio_LDFLAGS = $(AM_LDFLAGS) -static -odp_pktio_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_pktio -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_pktio_SOURCES = odp_pktio.c +odp_pktio_SOURCES = odp_pktio.c if test_example if HAVE_PCAP diff --git a/example/switch/Makefile.am b/example/switch/Makefile.am index 4134bcf3d..2fb21bc41 100644 --- a/example/switch/Makefile.am +++ b/example/switch/Makefile.am @@ -1,13 +1,8 @@ include $(top_srcdir)/example/Makefile.inc -bin_PROGRAMS = odp_switch$(EXEEXT) -odp_switch_LDFLAGS = $(AM_LDFLAGS) -static -odp_switch_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example +bin_PROGRAMS = odp_switch -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_switch_SOURCES = odp_switch.c +odp_switch_SOURCES = odp_switch.c if test_example if HAVE_PCAP diff --git a/example/time/Makefile.am b/example/time/Makefile.am index c1db37591..464fbfcab 100644 --- a/example/time/Makefile.am +++ b/example/time/Makefile.am @@ -1,10 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_time_global$(EXEEXT) -odp_time_global_LDFLAGS = $(AM_LDFLAGS) -static -odp_time_global_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h - -dist_odp_time_global_SOURCES = time_global_test.c +odp_time_global_SOURCES = time_global_test.c diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index edb8b2ca2..849319723 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -2,17 +2,10 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_timer_test$(EXEEXT) \ odp_timer_simple$(EXEEXT) -odp_timer_test_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_test_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_test_SOURCES = odp_timer_test.c +odp_timer_test_SOURCES = odp_timer_test.c -odp_timer_simple_LDFLAGS = $(AM_LDFLAGS) -static -odp_timer_simple_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -dist_odp_timer_simple_SOURCES = odp_timer_simple.c +odp_timer_simple_SOURCES = odp_timer_simple.c if test_example TESTS = odp_timer_simple endif - -noinst_HEADERS = \ - $(top_srcdir)/example/example_debug.h diff --git a/example/traffic_mgmt/Makefile.am b/example/traffic_mgmt/Makefile.am index c8ff79755..09aa03b1a 100644 --- a/example/traffic_mgmt/Makefile.am +++ b/example/traffic_mgmt/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/example/Makefile.inc bin_PROGRAMS = odp_traffic_mgmt$(EXEEXT) -odp_traffic_mgmt_LDFLAGS = $(AM_LDFLAGS) -static -odp_traffic_mgmt_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example -noinst_HEADERS = $(top_srcdir)/example/example_debug.h - -dist_odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c +odp_traffic_mgmt_SOURCES = odp_traffic_mgmt.c From patchwork Thu Oct 5 10: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: 114889 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp71399edb; Thu, 5 Oct 2017 03:32:15 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAioCiVLKHQMR+WPboFhN5gUWdtmVcEPmA3RA3G+YwfqSRBtvAXK9hG003tgHRiAUObpRVj X-Received: by 10.200.48.151 with SMTP id v23mr17157603qta.97.1507199535646; Thu, 05 Oct 2017 03:32:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199535; cv=none; d=google.com; s=arc-20160816; b=zhNtiJFwZl+GEng8Xv9k3iogrdmiyn02xsDLCPSlU6XDxW53wYixxhsf9qAD2hOiwJ iOpGYdVvrPMTFQBOdTKGMSwT+V1x+qjC4HT2fG5c5E6AnranAOsSUUddLlItsAKxzeuD irrO+RA01wA5me+MX0Hw7aUedd4e0RURwNXQTNbJJygrj2nE5zdTu+Ua91fS3UFLKAkV zbBFSwdEdtQxXIr3zc1mXp27I9zp/ZxxSJNRBVRETkFGO3OyGhM6LVrIjyN5eOjtoirH ukDud0Sjep43a5L2AcYubA8M9AOfRbNyarTB46ziIRFVTpvbgDZuv80jts0SGNHddagx /Zgg== 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=vV05FoVmJ59cvWzYeI076s7CtX+VsWXnyen/GVh/Ks0=; b=eW0Ml+woaRhNDnnEI9GrUnbLCCUtFbsGAF63Zf4Pn6njvy3AkNbe5nbViAWjIBZW16 EKQMUSu2UDGikpi8xafSUgLnMKdqFD4LJtSJZk27qAirmDsbmcgKbmWI6Qa5V4O1UhvF sfsQhS+w5nEks7qQjWMkG0nu4/LSONVp9aTtTIQT6qUWFBabHbjvYAnkvoKOqFtqEvkY bAnKobdPH0mow1jItRvwgY8lnzxHfBXu3OIXs4gi4KLlM1O9SPT55+jswLq8P+a1TVO6 tji8W8EWQhrnMLyCRYkkNy7k4wE22VZbpfoBXzeLsNhqT+Mu1RS7anOPdUlSzxh3k6sh FBLQ== 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 30si2073952qta.218.2017.10.05.03.32.15; Thu, 05 Oct 2017 03:32:15 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3F16965BB7; Thu, 5 Oct 2017 10:32:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_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 1636C65BE3; Thu, 5 Oct 2017 10:05:21 +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 3CF6265BCE; Thu, 5 Oct 2017 10:04:50 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 220A5644D5 for ; Thu, 5 Oct 2017 10:01:02 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 1DEDF5D83D15 for ; Thu, 5 Oct 2017 13:01:01 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id mLqGdu0hLw-0tSKI16R; Thu, 05 Oct 2017 13:00:55 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0sq0FpPD; Thu, 05 Oct 2017 13:00:54 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 13:00:17 +0300 Message-Id: <1507197617-6215-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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