From patchwork Thu Feb 22 11:00:09 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: 129202 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp478268lja; Thu, 22 Feb 2018 03:15:37 -0800 (PST) X-Google-Smtp-Source: AH8x224+kU5S6cvG5f0E5oqETty5tVF9UZH5LLXrHZKWxweWN/S9OHvXbcwjxt3Ry441lQaNRmXb X-Received: by 10.55.21.212 with SMTP id 81mr9856123qkv.280.1519298136965; Thu, 22 Feb 2018 03:15:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519298136; cv=none; d=google.com; s=arc-20160816; b=ih6WyMCS2JJvZA9tNveqny8uEAW5hVNvhmScLiNr8D5PB+NrLeW7rueZYn3kd+XkSv eP9o67B52jGzDP6j/EsqlvKxb9zhWyavB6qj8udvxZEPumJH1jViMf4nHVbHm+Hc+X03 dvf6nXEKdkITkvr+76N9WgRk0y1PFgx0gMJ8+D4cNab5PzJTNRCCAxshgjvaBwu+TT0W fpxwd4Vjs4g34U4hPnNqF78GlVR3rDh4lckisnDg/cZfIvTsipBUY6ivFGoxasXdAM4l H6JVBZb0I5V4gx4XZyWsNOAlfQMudfAhs6rtJY9GgeJ77Hl+GUuENX79//nvvMpfYGYv G6Eg== 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=O7QajFc+Xk49KtVEBJz1f5/KSrGUWerhP2JIwI2mUZw=; b=n2KWN7vWB+1QhDwmeh2vVBu4SWuWV+lxZF6L6f7SdgCKAYKV0bHjCnTOPG3cRq4Crg N9R5P6/nfz09GpPHDtBgXy6xJ7OjwUm1rN/ilLzJTvEQjIhXz2YVuCMoiCR14sW/Dxdf ISQ9xK7ZSbyN5Rf8z8XP6aTETmseEEO3pSZDRwTjM0R4Wyvw6pQtS+Y4yiDrHRF4oRXJ 9xUG/rwXKV8cYi7Xst0HS7oMawljpARRVLvqLkaBEGFlKVAk8r+H6Epoly6+2HBWX12V EBfBQQt+qNf+4AZ0doAbXQYeLr4t2ayBKpI2ua0/ieaH/6voNn4Cx26fGV8+YpR/F8qe 6DZg== 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 a6si2151703qte.291.2018.02.22.03.15.36; Thu, 22 Feb 2018 03:15:36 -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 8BB3160675; Thu, 22 Feb 2018 11:15: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2039960718; Thu, 22 Feb 2018 11:05:30 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D082861761; Thu, 22 Feb 2018 11:05:13 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id C168361762 for ; Thu, 22 Feb 2018 11:02:12 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward104p.mail.yandex.net (Yandex) with ESMTP id A98B018619A for ; Thu, 22 Feb 2018 14:00:19 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id b2nDF6o5Kd-0JbK652U; Thu, 22 Feb 2018 14:00:19 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 1KdKaWOyy6-0IYW52kM; 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:09 +0300 Message-Id: <1519297209-16246-9-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 8/8] linux-gen: 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/m4/configure.m4 | 2 +- platform/linux-generic/test/Makefile.am | 16 ++++++---------- .../test/validation/api/{pktio => }/Makefile.am | 0 .../test/validation/api/{pktio => }/pktio_env | 0 .../test/validation/api/{pktio => }/pktio_run.sh | 0 .../test/validation/api/{pktio => }/pktio_run_dpdk.sh | 0 .../test/validation/api/{pktio => }/pktio_run_netmap.sh | 0 .../test/validation/api/{pktio => }/pktio_run_pcap.sh | 0 .../test/validation/api/{pktio => }/pktio_run_tap.sh | 0 test/performance/odp_l2fwd_run.sh | 4 ++-- 10 files changed, 9 insertions(+), 13 deletions(-) rename platform/linux-generic/test/validation/api/{pktio => }/Makefile.am (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_env (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_dpdk.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_netmap.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_pcap.sh (100%) rename platform/linux-generic/test/validation/api/{pktio => }/pktio_run_tap.sh (100%) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7fa3652e2..544a02861 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -20,7 +20,7 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc 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/validation/api/Makefile platform/linux-generic/test/mmap_vlan_ins/Makefile platform/linux-generic/test/pktio_ipc/Makefile platform/linux-generic/test/ring/Makefile diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index 99934099a..06c06c7e8 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -4,35 +4,31 @@ TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance if test_vald -TESTS = validation/api/pktio/pktio_run.sh \ - validation/api/pktio/pktio_run_tap.sh \ +TESTS = validation/api/pktio_run.sh \ + validation/api/pktio_run_tap.sh \ validation/api/shmem/shmem_linux$(EXEEXT) -SUBDIRS += validation/api/pktio\ +SUBDIRS += validation/api\ validation/api/shmem\ mmap_vlan_ins\ pktio_ipc\ ring if HAVE_PCAP -TESTS += validation/api/pktio/pktio_run_pcap.sh +TESTS += validation/api/pktio_run_pcap.sh TESTS += mmap_vlan_ins/mmap_vlan_ins.sh SUBDIRS += mmap_vlan_ins endif if netmap_support -TESTS += validation/api/pktio/pktio_run_netmap.sh +TESTS += validation/api/pktio_run_netmap.sh endif if PKTIO_DPDK -TESTS += validation/api/pktio/pktio_run_dpdk.sh +TESTS += validation/api/pktio_run_dpdk.sh endif TESTS += pktio_ipc/pktio_ipc_run.sh SUBDIRS += pktio_ipc else -#performance tests refer to pktio_env -if test_perf -SUBDIRS += validation/api/pktio -endif endif TEST_EXTENSIONS = .sh diff --git a/platform/linux-generic/test/validation/api/pktio/Makefile.am b/platform/linux-generic/test/validation/api/Makefile.am similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/Makefile.am rename to platform/linux-generic/test/validation/api/Makefile.am diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_env b/platform/linux-generic/test/validation/api/pktio_env similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_env rename to platform/linux-generic/test/validation/api/pktio_env diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio_run.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run.sh rename to platform/linux-generic/test/validation/api/pktio_run.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio_run_dpdk.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh rename to platform/linux-generic/test/validation/api/pktio_run_dpdk.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio_run_netmap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh rename to platform/linux-generic/test/validation/api/pktio_run_netmap.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio_run_pcap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh rename to platform/linux-generic/test/validation/api/pktio_run_pcap.sh diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio_run_tap.sh similarity index 100% rename from platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh rename to platform/linux-generic/test/validation/api/pktio_run_tap.sh diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index 0cb293dc8..96930f6c6 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -42,8 +42,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 ${PLATFORM_VALIDATION}/api/pktio/pktio_env ]; then - . ${PLATFORM_VALIDATION}/api/pktio/pktio_env +elif [ -f ${PLATFORM_VALIDATION}/api/pktio_env ]; then + . ${PLATFORM_VALIDATION}/api/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."