summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-02-26 12:18:59 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-02-26 15:24:11 +0100
commit0c36081db2b0994c6e5cde3c07c358bbc092c3a3 (patch)
tree543e3f662ad9862978bb525dd72d571e433877a4
parentb543d1a71535cb76bd87069b30c3d481ebd8c2a8 (diff)
downloaddpdk-0c36081db2b0994c6e5cde3c07c358bbc092c3a3.zip
dpdk-0c36081db2b0994c6e5cde3c07c358bbc092c3a3.tar.gz
dpdk-0c36081db2b0994c6e5cde3c07c358bbc092c3a3.tar.xz
app/cmdline: move from test directory
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. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--app/Makefile1
-rw-r--r--app/meson.build4
-rw-r--r--app/test-cmdline/Makefile (renamed from test/cmdline_test/Makefile)0
-rw-r--r--app/test-cmdline/cmdline_test.c (renamed from test/cmdline_test/cmdline_test.c)0
-rw-r--r--app/test-cmdline/cmdline_test.h (renamed from test/cmdline_test/cmdline_test.h)0
-rwxr-xr-xapp/test-cmdline/cmdline_test.py (renamed from test/cmdline_test/cmdline_test.py)0
-rw-r--r--app/test-cmdline/cmdline_test_data.py (renamed from test/cmdline_test/cmdline_test_data.py)0
-rw-r--r--app/test-cmdline/commands.c (renamed from test/cmdline_test/commands.c)0
-rw-r--r--app/test-cmdline/meson.build5
-rw-r--r--test/Makefile1
11 files changed, 10 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3b39bc6..293bf6a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1167,7 +1167,7 @@ F: test/test/test_cfgfiles/
Interactive command line
M: Olivier Matz <olivier.matz@6wind.com>
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 d6641ef..51237d0 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 47a2a86..8bdf4f5 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
index 3e74219..3e74219 100644
--- a/test/cmdline_test/Makefile
+++ b/app/test-cmdline/Makefile
diff --git a/test/cmdline_test/cmdline_test.c b/app/test-cmdline/cmdline_test.c
index 3e40633..3e40633 100644
--- a/test/cmdline_test/cmdline_test.c
+++ b/app/test-cmdline/cmdline_test.c
diff --git a/test/cmdline_test/cmdline_test.h b/app/test-cmdline/cmdline_test.h
index 13af4f3..13af4f3 100644
--- a/test/cmdline_test/cmdline_test.h
+++ b/app/test-cmdline/cmdline_test.h
diff --git a/test/cmdline_test/cmdline_test.py b/app/test-cmdline/cmdline_test.py
index 3a8fac4..3a8fac4 100755
--- a/test/cmdline_test/cmdline_test.py
+++ b/app/test-cmdline/cmdline_test.py
diff --git a/test/cmdline_test/cmdline_test_data.py b/app/test-cmdline/cmdline_test_data.py
index 114d2cb..114d2cb 100644
--- a/test/cmdline_test/cmdline_test_data.py
+++ b/app/test-cmdline/cmdline_test_data.py
diff --git a/test/cmdline_test/commands.c b/app/test-cmdline/commands.c
index d81da96..d81da96 100644
--- a/test/cmdline_test/commands.c
+++ b/app/test-cmdline/commands.c
diff --git a/app/test-cmdline/meson.build b/app/test-cmdline/meson.build
new file mode 100644
index 0000000..9d0a9ae
--- /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 6656374..4ffc087 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