From patchwork Tue Feb 26 12:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50508 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 313C3326C; Tue, 26 Feb 2019 13:19:19 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 147E5324D for ; Tue, 26 Feb 2019 13:19:16 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 04:19:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,415,1544515200"; d="scan'208";a="150086078" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 04:19:14 -0800 From: Bruce Richardson To: thomas@monjalon.net Cc: dev@dpdk.org, Bruce Richardson , Olivier Matz Date: Tue, 26 Feb 2019 12:18:59 +0000 Message-Id: <20190226121903.5499-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226121903.5499-1-bruce.richardson@intel.com> References: <20190125202642.66559-1-bruce.richardson@intel.com> <20190226121903.5499-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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. For consistency of naming, the subdirectory is also renamed from cmdline_test to test-cmdline. CC: Olivier Matz Signed-off-by: Bruce Richardson --- MAINTAINERS | 2 +- app/Makefile | 1 + app/meson.build | 4 +++- {test/cmdline_test => app/test-cmdline}/Makefile | 0 {test/cmdline_test => app/test-cmdline}/cmdline_test.c | 0 {test/cmdline_test => app/test-cmdline}/cmdline_test.h | 0 {test/cmdline_test => app/test-cmdline}/cmdline_test.py | 0 {test/cmdline_test => app/test-cmdline}/cmdline_test_data.py | 0 {test/cmdline_test => app/test-cmdline}/commands.c | 0 app/test-cmdline/meson.build | 5 +++++ test/Makefile | 1 - 11 files changed, 10 insertions(+), 3 deletions(-) rename {test/cmdline_test => app/test-cmdline}/Makefile (100%) rename {test/cmdline_test => app/test-cmdline}/cmdline_test.c (100%) rename {test/cmdline_test => app/test-cmdline}/cmdline_test.h (100%) rename {test/cmdline_test => app/test-cmdline}/cmdline_test.py (100%) rename {test/cmdline_test => app/test-cmdline}/cmdline_test_data.py (100%) rename {test/cmdline_test => app/test-cmdline}/commands.c (100%) create mode 100644 app/test-cmdline/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 3b39bc65d..293bf6aa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,7 +1167,7 @@ F: test/test/test_cfgfiles/ Interactive command line M: Olivier Matz F: lib/librte_cmdline/ -F: test/cmdline_test/ +F: app/test-cmdline/ 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..51237d0f4 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) += test-cmdline ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y) DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev diff --git a/app/meson.build b/app/meson.build index 47a2a8615..8bdf4f581 100644 --- a/app/meson.build +++ b/app/meson.build @@ -1,9 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -apps = ['pdump', +apps = [ + 'pdump', 'proc-info', 'test-bbdev', + 'test-cmdline', 'test-compress-perf', 'test-crypto-perf', 'test-eventdev', diff --git a/test/cmdline_test/Makefile b/app/test-cmdline/Makefile similarity index 100% rename from test/cmdline_test/Makefile rename to app/test-cmdline/Makefile diff --git a/test/cmdline_test/cmdline_test.c b/app/test-cmdline/cmdline_test.c similarity index 100% rename from test/cmdline_test/cmdline_test.c rename to app/test-cmdline/cmdline_test.c diff --git a/test/cmdline_test/cmdline_test.h b/app/test-cmdline/cmdline_test.h similarity index 100% rename from test/cmdline_test/cmdline_test.h rename to app/test-cmdline/cmdline_test.h diff --git a/test/cmdline_test/cmdline_test.py b/app/test-cmdline/cmdline_test.py similarity index 100% rename from test/cmdline_test/cmdline_test.py rename to app/test-cmdline/cmdline_test.py diff --git a/test/cmdline_test/cmdline_test_data.py b/app/test-cmdline/cmdline_test_data.py similarity index 100% rename from test/cmdline_test/cmdline_test_data.py rename to app/test-cmdline/cmdline_test_data.py diff --git a/test/cmdline_test/commands.c b/app/test-cmdline/commands.c similarity index 100% rename from test/cmdline_test/commands.c rename to app/test-cmdline/commands.c diff --git a/app/test-cmdline/meson.build b/app/test-cmdline/meson.build new file mode 100644 index 000000000..9d0a9aeb6 --- /dev/null +++ b/app/test-cmdline/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/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