From patchwork Tue Feb 19 14:53:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50368 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F2425A44; Tue, 19 Feb 2019 15:53:26 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 2A3945942 for ; Tue, 19 Feb 2019 15:53:24 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Feb 2019 06:53:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,388,1544515200"; d="scan'208";a="321589063" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga005.fm.intel.com with ESMTP; 19 Feb 2019 06:53:23 -0800 From: Bruce Richardson To: dev@dpdk.org, thomas@monjalon.net Cc: Bruce Richardson , Olivier Matz Date: Tue, 19 Feb 2019 14:53:04 +0000 Message-Id: <20190219145308.65668-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190219145308.65668-1-bruce.richardson@intel.com> References: <20190125202642.66559-1-bruce.richardson@intel.com> <20190219145308.65668-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/5] test/cmdline_test: move to app directory X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Move app to "app" directory and enable with meson build. CC: Olivier Matz Signed-off-by: Bruce Richardson --- MAINTAINERS | 2 +- app/Makefile | 1 + {test => app}/cmdline_test/Makefile | 0 {test => app}/cmdline_test/cmdline_test.c | 0 {test => app}/cmdline_test/cmdline_test.h | 0 {test => app}/cmdline_test/cmdline_test.py | 0 {test => app}/cmdline_test/cmdline_test_data.py | 0 {test => app}/cmdline_test/commands.c | 0 app/cmdline_test/meson.build | 5 +++++ app/meson.build | 3 ++- test/Makefile | 1 - 11 files changed, 9 insertions(+), 3 deletions(-) rename {test => app}/cmdline_test/Makefile (100%) rename {test => app}/cmdline_test/cmdline_test.c (100%) rename {test => app}/cmdline_test/cmdline_test.h (100%) rename {test => app}/cmdline_test/cmdline_test.py (100%) rename {test => app}/cmdline_test/cmdline_test_data.py (100%) rename {test => app}/cmdline_test/commands.c (100%) create mode 100644 app/cmdline_test/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index eef480ab5..1a381f9bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1168,7 +1168,7 @@ F: test/test/test_cfgfiles/ Interactive command line M: Olivier Matz F: lib/librte_cmdline/ -F: test/cmdline_test/ +F: app/cmdline_test/ F: test/test/test_cmdline* F: examples/cmdline/ F: doc/guides/sample_app_ug/cmd_line.rst diff --git a/app/Makefile b/app/Makefile index d6641ef1c..3515097d9 100644 --- a/app/Makefile +++ b/app/Makefile @@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump +DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev diff --git a/test/cmdline_test/Makefile b/app/cmdline_test/Makefile similarity index 100% rename from test/cmdline_test/Makefile rename to app/cmdline_test/Makefile diff --git a/test/cmdline_test/cmdline_test.c b/app/cmdline_test/cmdline_test.c similarity index 100% rename from test/cmdline_test/cmdline_test.c rename to app/cmdline_test/cmdline_test.c diff --git a/test/cmdline_test/cmdline_test.h b/app/cmdline_test/cmdline_test.h similarity index 100% rename from test/cmdline_test/cmdline_test.h rename to app/cmdline_test/cmdline_test.h diff --git a/test/cmdline_test/cmdline_test.py b/app/cmdline_test/cmdline_test.py similarity index 100% rename from test/cmdline_test/cmdline_test.py rename to app/cmdline_test/cmdline_test.py diff --git a/test/cmdline_test/cmdline_test_data.py b/app/cmdline_test/cmdline_test_data.py similarity index 100% rename from test/cmdline_test/cmdline_test_data.py rename to app/cmdline_test/cmdline_test_data.py diff --git a/test/cmdline_test/commands.c b/app/cmdline_test/commands.c similarity index 100% rename from test/cmdline_test/commands.c rename to app/cmdline_test/commands.c diff --git a/app/cmdline_test/meson.build b/app/cmdline_test/meson.build new file mode 100644 index 000000000..9d0a9aeb6 --- /dev/null +++ b/app/cmdline_test/meson.build @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +sources = files('commands.c', 'cmdline_test.c') +deps += 'cmdline' diff --git a/app/meson.build b/app/meson.build index 47a2a8615..9fc9b4fdc 100644 --- a/app/meson.build +++ b/app/meson.build @@ -1,7 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -apps = ['pdump', +apps = ['cmdline_test', + 'pdump', 'proc-info', 'test-bbdev', 'test-compress-perf', diff --git a/test/Makefile b/test/Makefile index 6656374fc..4ffc087a0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -6,6 +6,5 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_APP_TEST) += test DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline -DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test include $(RTE_SDK)/mk/rte.subdir.mk