From patchwork Thu Jun 4 18:06:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Milard X-Patchwork-Id: 49548 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4EC5421562 for ; Thu, 4 Jun 2015 18:10:58 +0000 (UTC) Received: by laboh3 with SMTP id oh3sf13772057lab.0 for ; Thu, 04 Jun 2015 11:10:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=iokhZ6KtMpMkAb9YyD+sxj5KaJa4R81oO4YzLfkEPhM=; b=iO2N7Tlh5OODsmtFlUdTG1pLVP0QKkxsAFze+Ch3F7ec6Gbi/wDXRn23mO3AIB+clM kCRPb/O1Qtd+vgM3WZD0duFrcaBgB9Mz+/UVUQEWxndQLGxh99rWUBWBSRLzxF7Eq515 vqqhHMgH+qAKWRT1CY0ZBJD3TLWted0eNVOHbTrQzRgEbHGt46GjgQfVTf2bTCaoaqMs Fe1XmPyBZm3ovb5lVCzAbGwZbcmnmt+1GiW5QFOW1OQ7rZEqvnQq9cuxZX5YtgJ/nNgJ Ku5r6PcVEi2mLVnWY276xDlvlzOdLCxFyMdsHuL7hQF0UsW69QvxH5x5w2iRuu8F8Eka BeBg== X-Gm-Message-State: ALoCoQm0VjxhB+BSfZiJCS2QHcWWjg+Tvu//LYMBTq5pSjWUmqOL81k9UUmdp02v40MaaILWTq3b X-Received: by 10.112.166.137 with SMTP id zg9mr36691679lbb.11.1433441456986; Thu, 04 Jun 2015 11:10:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.72 with SMTP id h8ls259540laa.71.gmail; Thu, 04 Jun 2015 11:10:56 -0700 (PDT) X-Received: by 10.152.6.105 with SMTP id z9mr38000105laz.98.1433441456825; Thu, 04 Jun 2015 11:10:56 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id kd4si2518833lbc.42.2015.06.04.11.10.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2015 11:10:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labko7 with SMTP id ko7so37817360lab.2 for ; Thu, 04 Jun 2015 11:10:56 -0700 (PDT) X-Received: by 10.112.97.194 with SMTP id ec2mr22456794lbb.88.1433441456689; Thu, 04 Jun 2015 11:10:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp795911lbb; Thu, 4 Jun 2015 11:10:55 -0700 (PDT) X-Received: by 10.229.117.7 with SMTP id o7mr29563073qcq.29.1433441453971; Thu, 04 Jun 2015 11:10:53 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t18si4885049qgd.12.2015.06.04.11.10.53; Thu, 04 Jun 2015 11:10:53 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id D9B8062093; Thu, 4 Jun 2015 18:10:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E9D43620A2; Thu, 4 Jun 2015 18:08:22 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3F0ED6209A; Thu, 4 Jun 2015 18:08:10 +0000 (UTC) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by lists.linaro.org (Postfix) with ESMTPS id 4987F62098 for ; Thu, 4 Jun 2015 18:07:40 +0000 (UTC) Received: by lbbtu8 with SMTP id tu8so16172465lbb.2 for ; Thu, 04 Jun 2015 11:07:39 -0700 (PDT) X-Received: by 10.152.21.5 with SMTP id r5mr38416646lae.24.1433441258976; Thu, 04 Jun 2015 11:07:38 -0700 (PDT) Received: from localhost.localdomain (c-83-233-90-46.cust.bredband2.com. [83.233.90.46]) by mx.google.com with ESMTPSA id x9sm955058lag.18.2015.06.04.11.07.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jun 2015 11:07:38 -0700 (PDT) From: Christophe Milard To: anders.roxell@linaro.org, mike.holmes@linaro.org, stuart.haslam@linaro.org, maxim.uvarov@linaro.org Date: Thu, 4 Jun 2015 20:06:59 +0200 Message-Id: <1433441220-25295-8-git-send-email-christophe.milard@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433441220-25295-1-git-send-email-christophe.milard@linaro.org> References: <1433441220-25295-1-git-send-email-christophe.milard@linaro.org> X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [PATCHv3 7/8] validation: moving pktio plt specific to platform X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christophe.milard@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The platform specific scripts for pktio are now moved from the validation to the platform side. Pktio tests are now initiated from the platform side. Signed-off-by: Christophe Milard --- configure.ac | 1 + platform/linux-generic/test/.gitignore | 2 + platform/linux-generic/test/Makefile.am | 9 +++- platform/linux-generic/test/pktio/.gitignore | 2 + platform/linux-generic/test/pktio/Makefile.am | 2 + platform/linux-generic/test/{ => pktio}/pktio_env | 0 .../linux-generic/test}/pktio/pktio_run | 49 ++++++++++------------ test/performance/odp_l2fwd_run | 4 +- test/validation/Makefile.am | 4 +- test/validation/pktio/Makefile.am | 2 - 10 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 platform/linux-generic/test/.gitignore create mode 100644 platform/linux-generic/test/pktio/.gitignore create mode 100644 platform/linux-generic/test/pktio/Makefile.am rename platform/linux-generic/test/{ => pktio}/pktio_env (100%) rename {test/validation => platform/linux-generic/test}/pktio/pktio_run (51%) diff --git a/configure.ac b/configure.ac index 96126cb..98eba55 100644 --- a/configure.ac +++ b/configure.ac @@ -297,6 +297,7 @@ AC_CONFIG_FILES([Makefile helper/test/Makefile pkgconfig/libodp.pc platform/linux-generic/Makefile + platform/linux-generic/test/pktio/Makefile scripts/Makefile test/Makefile test/api_test/Makefile diff --git a/platform/linux-generic/test/.gitignore b/platform/linux-generic/test/.gitignore new file mode 100644 index 0000000..7e563b8 --- /dev/null +++ b/platform/linux-generic/test/.gitignore @@ -0,0 +1,2 @@ +*.log +*.trs diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 91e361c..2e0bc11 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1 +1,8 @@ -dist_bin_SCRIPTS = $(srcdir)/pktio_env +TESTS_ENVIRONMENT = TEST_DIR=${top_builddir}/test/validation + +if test_vald +TESTS = pktio/pktio_run +endif + +ODP_MODULES = pktio +SUBDIRS = $(ODP_MODULES) diff --git a/platform/linux-generic/test/pktio/.gitignore b/platform/linux-generic/test/pktio/.gitignore new file mode 100644 index 0000000..7e563b8 --- /dev/null +++ b/platform/linux-generic/test/pktio/.gitignore @@ -0,0 +1,2 @@ +*.log +*.trs diff --git a/platform/linux-generic/test/pktio/Makefile.am b/platform/linux-generic/test/pktio/Makefile.am new file mode 100644 index 0000000..93281dd --- /dev/null +++ b/platform/linux-generic/test/pktio/Makefile.am @@ -0,0 +1,2 @@ +dist_bin_SCRIPTS = pktio_env \ + pktio_run diff --git a/platform/linux-generic/test/pktio_env b/platform/linux-generic/test/pktio/pktio_env similarity index 100% rename from platform/linux-generic/test/pktio_env rename to platform/linux-generic/test/pktio/pktio_env diff --git a/test/validation/pktio/pktio_run b/platform/linux-generic/test/pktio/pktio_run similarity index 51% rename from test/validation/pktio/pktio_run rename to platform/linux-generic/test/pktio/pktio_run index aed0cd2..8b85f66 100755 --- a/test/validation/pktio/pktio_run +++ b/platform/linux-generic/test/pktio/pktio_run @@ -6,26 +6,24 @@ # SPDX-License-Identifier: BSD-3-Clause # -# TEST_DIR is set by Makefile to point to the directory where binaries have been -# built (Makefile variable builddir) -# If TEST_DIR is not set it means we are not running with make, and in this case -# there are two situations: -# 1. user build ODP in the same dir as the source (most likely) -# here the user can simply call pktio_run -# 2. user may have built ODP in a separate build dir (like bitbake usually does) -# here the user has to do something like $ODP/test/validation/pktio_run -# -# In both situations the script assumes that the user is in the directory where -# pktio_main exists. If that's not true, then the user has to specify the path -# to it and run: -# TEST_DIR=$builddir $ODP/test/validation/pktio_run +# directories where pktio_main binary can be found: +# -in the validation dir when running make check (intree or out of tree) +# -in the script directory, when running after 'make install', or +# -in the validation when running standalone (./pktio_run) intree. +# running stand alone out of tree requires setting PATH +PATH=$PATH:${TEST_DIR}/pktio +PATH=$PATH:$(dirname $0) +PATH=$PATH:$(dirname $0)/../../../../test/validation/pktio -# directory where test binaries have been built -TEST_DIR="${TEST_DIR:-$PWD}" -# directory where test sources are, including scripts -TEST_SRC_DIR=$(dirname $0) +pktio_main_path=$(which pktio_main) +if [ -x "$pktio_main_path" ] ; then + echo "running with pktio_main: $pktio_run_path" +else + echo "cannot find pktio_main: please set you PATH for it." +fi -PATH=$TEST_DIR:$PATH +# directory where platform test sources are, including scripts +TEST_SRC_DIR=$(dirname $0) # exit codes expected by automake for skipped tests TEST_SKIPPED=77 @@ -33,12 +31,8 @@ TEST_SKIPPED=77 # Use installed pktio env or for make check take it from platform directory if [ -f "./pktio_env" ]; then . ./pktio_env -elif [ "$ODP_PLATFORM" = "" ]; then - echo "$0: error: ODP_PLATFORM must be defined" - # not skipped as this should never happen via "make check" - exit 1 -elif [ -f ${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/pktio_env ]; then - . ${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/pktio_env +elif [ -f ${TEST_SRC_DIR}/pktio_env ]; then + . ${TEST_SRC_DIR}/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." @@ -61,7 +55,7 @@ run_test() if [ "$disabletype" != "SKIP" ]; then export ODP_PKTIO_DISABLE_SOCKET_${distype}=y fi - ${TEST_DIR}/pktio/pktio_main + pktio_main if [ $? -ne 0 ]; then ret=1 fi @@ -76,9 +70,10 @@ run_test() run() { - if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ]; then + #need to be root to set the interface: if not, run with default loopback. + if [ "$(id -u)" != "0" ]; then echo "pktio: using 'loop' device" - ${TEST_DIR}/pktio/pktio_main + pktio_main exit $? fi diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run index bbf0c0c..120da21 100755 --- a/test/performance/odp_l2fwd_run +++ b/test/performance/odp_l2fwd_run @@ -37,8 +37,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ]; then - . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env +elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test." diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 74304f5..0c69636 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -25,10 +25,8 @@ EXECUTABLES = odp_buffer \ odp_thread \ odp_ver_abt_log_dbg -TESTSCRIPTS = pktio/pktio_run - if test_vald -TESTS = $(EXECUTABLES) $(TESTSCRIPTS) +TESTS = $(EXECUTABLES) endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) diff --git a/test/validation/pktio/Makefile.am b/test/validation/pktio/Makefile.am index c2ecc23..1d1a0d9 100644 --- a/test/validation/pktio/Makefile.am +++ b/test/validation/pktio/Makefile.am @@ -1,7 +1,5 @@ include ../Makefile.inc -dist_bin_SCRIPTS = pktio_run - noinst_LIBRARIES = libpktio.a libpktio_a_SOURCES = pktio.c