From patchwork Thu Feb 22 11:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 129196 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp467223lja; Thu, 22 Feb 2018 03:03:14 -0800 (PST) X-Google-Smtp-Source: AG47ELuDdhgAjYR26/ipJideKkXptSC7sO5pBLNu/HvwKhfD9D09Ju5IS4kexxTK2REi2vVzPCQG X-Received: by 10.55.77.77 with SMTP id a74mr9554762qkb.239.1519297394739; Thu, 22 Feb 2018 03:03:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519297394; cv=none; d=google.com; s=arc-20160816; b=rad3+EeYKgtxmDc0OYutRnV4jzbDCx901m9cylXenxB06q2MbE9vvNV6o+kozcCnSj FfcGgee/wNtLO2+pEE7tLnMWg/j4Gj/cLVjUQ1/OpNgjE5+9IstDxIR31TwjMrGpspfQ SKvEQFir+77N29lkSz8POy4X34ALk3cOCugaFox4pzQ1vl+A4TNxDnD3p5OiI60CvEMq vhVtYuDlMKt4xBN1BIBNS+6CniLyVB+m0OoukC5xpZo155hm7v6YEw2w1tCYbX68Qgfg TLTMkfcDL+cvKQ9vN4gMU6qHcnAvfOACXLEX2KhJ0qVUmIjhBuvtXM65yHEFAbTAiAzg V+uA== 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=btH9l4lkvLd536eGWk+MB8WmpvoCXg+WVH96wiaHetQ=; b=Bpkhubo4iVA5Qj93SB47O8OYqu+3VCh5Rx5OqCXjhJWjyr7P0VRU094k8RFb0NeuI9 6SjWVcEtGuO+5MZj4isoKTtVOoyb8tod/cT/BIFn1+XLrA0yafI5HgenTfM2uABVvERU PEvix/6G8RxhHGjTlO+DcESv4J20kMV04ozYITws1sXHb/TuINNgy9mTSkCa8idzwJwU ukrLYOYR+3jzdBPOf7fRcm3NtqarTByryIeSQDu/b1OpyG3SBW7rt0W1xsNM1I0BfwHG S26mjmdWbjN61UQ3jDLAK+8N4kTxKTrRLcjb/oyDBtnXIOF1f/QEBWV1Wr1HQHFumGTI KyeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id y84si1161345qkb.103.2018.02.22.03.03.14; Thu, 22 Feb 2018 03:03:14 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 56673617A1; Thu, 22 Feb 2018 11:03: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 B218461753; Thu, 22 Feb 2018 11:00:43 +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 50E1861748; Thu, 22 Feb 2018 11:00:26 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id DB7E0616FF for ; Thu, 22 Feb 2018 11:00:20 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward100o.mail.yandex.net (Yandex) with ESMTP id D65D72A22B03 for ; Thu, 22 Feb 2018 14:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id TD12ERvX6g-0IdKVTev; Thu, 22 Feb 2018 14:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0IYGLBfm; Thu, 22 Feb 2018 14:00:18 +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, 22 Feb 2018 14:00:08 +0300 Message-Id: <1519297209-16246-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> References: <1519297209-16246-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 496 Subject: [lng-odp] [PATCH v5 7/8] validation: move pktio test to api/ 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 496 (lumag:tests-fix-2) ** https://github.com/Linaro/odp/pull/496 ** Patch: https://github.com/Linaro/odp/pull/496.patch ** Base sha: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb ** Merge commit sha: ff7207680d71ef66c6c24fcacdc8597168abbd6b **/ platform/linux-generic/test/validation/api/pktio/pktio_run.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh | 4 ++-- platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh | 4 ++-- test/m4/configure.m4 | 3 +-- test/validation/api/.gitignore | 1 + test/validation/api/Makefile.am | 5 ++--- test/validation/api/{pktio => }/pktio.c | 2 +- test/validation/api/pktio/.gitignore | 1 - test/validation/api/pktio/Makefile.am | 4 ---- test/validation/api/{pktio/parser.c => pktio_parser.c} | 2 +- test/validation/api/{pktio/parser.h => pktio_parser.h} | 0 13 files changed, 16 insertions(+), 22 deletions(-) rename test/validation/api/{pktio => }/pktio.c (99%) delete mode 100644 test/validation/api/pktio/.gitignore delete mode 100644 test/validation/api/pktio/Makefile.am rename test/validation/api/{pktio/parser.c => pktio_parser.c} (99%) rename test/validation/api/{pktio/parser.h => pktio_parser.h} (100%) 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 5b861bbbf..76c12b901 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$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 24194cbc9..730cdbca1 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 @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$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 610be3bdc..e0a19caea 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 @@ -15,9 +15,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$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 5ab45094a..247854796 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 @@ -15,9 +15,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$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 ecfe5a126..3aae928c5 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 @@ -16,9 +16,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/pktio:$PATH +PATH=${TEST_DIR}/api:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 18c71d799..52e9317d5 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -7,5 +7,4 @@ AC_CONFIG_FILES([test/Makefile test/miscellaneous/Makefile test/performance/Makefile test/validation/Makefile - test/validation/api/Makefile - test/validation/api/pktio/Makefile]) + test/validation/api/Makefile]) diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore index f6bf6e54b..50a76a3b9 100644 --- a/test/validation/api/.gitignore +++ b/test/validation/api/.gitignore @@ -20,6 +20,7 @@ ipsec_inline_out ipsec_sync lock_main packet_main +pktio_main pool_main queue_main random_main diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 0b6547b5e..6a0176893 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -1,6 +1,3 @@ -ODP_MODULES = \ - pktio - SUBDIRS = $(ODP_MODULES) include Makefile.inc @@ -25,6 +22,7 @@ test_PROGRAMS = \ ipsec_sync \ lock_main \ packet_main \ + pktio_main \ pool_main \ queue_main \ random_main \ @@ -70,6 +68,7 @@ ipsec_inline_out_SOURCES = ipsec_inline_out.c ipsec_inline_out_LDADD = $(LDADD) libtestipsec.la lock_main_SOURCES = lock.c packet_main_SOURCES = packet.c +pktio_main_SOURCES = pktio.c pktio_parser.c pktio_parser.h pool_main_SOURCES = pool.c queue_main_SOURCES = queue.c random_main_SOURCES = random.c diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio.c similarity index 99% rename from test/validation/api/pktio/pktio.c rename to test/validation/api/pktio.c index a0496642f..3516d6f4a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio.c @@ -12,7 +12,7 @@ #include #include -#include "parser.h" +#include "pktio_parser.h" #define PKT_BUF_NUM 32 #define PKT_BUF_SIZE (9 * 1024) diff --git a/test/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore deleted file mode 100644 index 1a5dd46e4..000000000 --- a/test/validation/api/pktio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pktio_main diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am deleted file mode 100644 index ffd1827be..000000000 --- a/test/validation/api/pktio/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -include ../Makefile.inc - -test_PROGRAMS = pktio_main -pktio_main_SOURCES = pktio.c parser.c parser.h diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio_parser.c similarity index 99% rename from test/validation/api/pktio/parser.c rename to test/validation/api/pktio_parser.c index e0431441f..a998981e0 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio_parser.c @@ -13,7 +13,7 @@ #include #include -#include "parser.h" +#include "pktio_parser.h" #define MAX_NUM_IFACES 2 #define PKT_POOL_NUM 256 diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio_parser.h similarity index 100% rename from test/validation/api/pktio/parser.h rename to test/validation/api/pktio_parser.h