From patchwork Fri Oct 6 19: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: 115123 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1708562edb; Fri, 6 Oct 2017 12:12:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDPMYCPdGuOcT9REB4cSR7jy+DWSVk4mWncjdKwb7kySF/40ah22PapjOc1pcJqwmsmpfwB X-Received: by 10.107.222.6 with SMTP id v6mr3749658iog.46.1507317143916; Fri, 06 Oct 2017 12:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507317143; cv=none; d=google.com; s=arc-20160816; b=IvlJQEahdsi4QwJ/GmoXrs7Rn5UeTzmEPEmRw53BqsNWP/SMSm3iNUgL74pY8CgByo r+QmQpuEsk+wPKld4IcbZkIFBDdOy14G37wih/O+uO9lxCOwl+aricOizz4g3xTcFYmP ubwP0v6AHtAmVgySDvVbfuEnd+iCrV6ZveD6qsxBeZ09MIPZ/U5mje9F27GHIBn8n/nq pNxsD87BawbdS/Ijy7X7ksjY0eFGLpg4/8vQEITjWzyd56r02S5s7a0UG+Gs0vo3+kBC XxnIyhaZBq7VU+23Zow53hCTJBeKP8ioeS50dX3GMyt5yzhUIed/BigrbT8SP6sviv33 B83Q== 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=iw3c7uPPAt2fMVuelYqIM5daEJ98uwizHv6FxsHVrzc=; b=XD6FYuaD2cAEw1ZNu/gl7MP9wyKwQ4SvHC89QQ9tzdafRWCVxfmoDU0rCeEelaAnml qViDwbj7FKU6HKqtYDzoHAucz9vPtkKw3NXDBYVireoCKIujklODsxVh54ez2kGR5KhK FCP+cEgnh7f3m1DWYVIULXK5p3pDKq8+E3JDh9tkLvO7wD4pMrXhO6pWt8efWn5E0A1y kw2wUPTSEOu4PEEk8+Njd+e//Syy3C5CUd27zV/6UZQp/uf0Iq9cJrOVU/QUeqB4uMHL AtFDm9TNQAO7QbCla1BO3Ij9RAB6vqWEQUyKi9Mg7Kuxu7S/O7OCAK6IZ5rfPcjavHk1 mwSw== 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 d20si1588167iod.158.2017.10.06.12.12.22; Fri, 06 Oct 2017 12:12:23 -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 EE370608A8; Fri, 6 Oct 2017 19:12:21 +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 61A5165BE3; Fri, 6 Oct 2017 19:03: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 10AA865C00; Fri, 6 Oct 2017 19:02:44 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 3007665BCE for ; Fri, 6 Oct 2017 19:00:47 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 2E30112435DE for ; Fri, 6 Oct 2017 22:00:46 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id fueqFzPHNQ-0eWWI6rf; Fri, 06 Oct 2017 22:00:40 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id d2nf8B3eVo-0dtedt9w; Fri, 06 Oct 2017 22:00:39 +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: Fri, 6 Oct 2017 22:00:05 +0300 Message-Id: <1507316415-2144-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 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: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ 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..0baf7e132 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)/../../../../../../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_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