summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-02-26 12:19:01 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-02-26 15:28:46 +0100
commit474572d2ae5a17b6596053c2630753fe04fc304f (patch)
tree09b1bf272627708928c6d1534b53c074f63ba728
parent75795fabd27437d399bbdf7888f0f2515a3feda4 (diff)
downloaddpdk-474572d2ae5a17b6596053c2630753fe04fc304f.zip
dpdk-474572d2ae5a17b6596053c2630753fe04fc304f.tar.gz
dpdk-474572d2ae5a17b6596053c2630753fe04fc304f.tar.xz
app/pipeline: move from test directory
Move to the app directory, and add to meson build. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--app/Makefile1
-rw-r--r--app/meson.build1
-rw-r--r--app/test-pipeline/Makefile (renamed from test/test-pipeline/Makefile)0
-rw-r--r--app/test-pipeline/config.c (renamed from test/test-pipeline/config.c)0
-rw-r--r--app/test-pipeline/init.c (renamed from test/test-pipeline/init.c)0
-rw-r--r--app/test-pipeline/main.c (renamed from test/test-pipeline/main.c)0
-rw-r--r--app/test-pipeline/main.h (renamed from test/test-pipeline/main.h)0
-rw-r--r--app/test-pipeline/meson.build14
-rw-r--r--app/test-pipeline/pipeline_acl.c (renamed from test/test-pipeline/pipeline_acl.c)0
-rw-r--r--app/test-pipeline/pipeline_hash.c (renamed from test/test-pipeline/pipeline_hash.c)0
-rw-r--r--app/test-pipeline/pipeline_lpm.c (renamed from test/test-pipeline/pipeline_lpm.c)0
-rw-r--r--app/test-pipeline/pipeline_lpm_ipv6.c (renamed from test/test-pipeline/pipeline_lpm_ipv6.c)0
-rw-r--r--app/test-pipeline/pipeline_stub.c (renamed from test/test-pipeline/pipeline_stub.c)0
-rw-r--r--app/test-pipeline/runtime.c (renamed from test/test-pipeline/runtime.c)0
-rw-r--r--doc/guides/sample_app_ug/test_pipeline.rst2
-rw-r--r--test/Makefile1
17 files changed, 18 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f34c6e..b690e1e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1093,7 +1093,7 @@ F: lib/librte_port/
F: lib/librte_table/
F: doc/guides/prog_guide/packet_framework.rst
F: test/test/test_table*
-F: test/test-pipeline/
+F: app/test-pipeline/
F: doc/guides/sample_app_ug/test_pipeline.rst
F: examples/ip_pipeline/
F: doc/guides/sample_app_ug/ip_pipeline.rst
diff --git a/app/Makefile b/app/Makefile
index 234e3f5..eaf5016 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -8,6 +8,7 @@ DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info
DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline
+DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
diff --git a/app/meson.build b/app/meson.build
index 3a34ebb..2360a3d 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -10,6 +10,7 @@ apps = [
'test-compress-perf',
'test-crypto-perf',
'test-eventdev',
+ 'test-pipeline',
'test-pmd']
# for BSD only
diff --git a/test/test-pipeline/Makefile b/app/test-pipeline/Makefile
index fc3a504..fc3a504 100644
--- a/test/test-pipeline/Makefile
+++ b/app/test-pipeline/Makefile
diff --git a/test/test-pipeline/config.c b/app/test-pipeline/config.c
index 28ac9fc..28ac9fc 100644
--- a/test/test-pipeline/config.c
+++ b/app/test-pipeline/config.c
diff --git a/test/test-pipeline/init.c b/app/test-pipeline/init.c
index b75688a..b75688a 100644
--- a/test/test-pipeline/init.c
+++ b/app/test-pipeline/init.c
diff --git a/test/test-pipeline/main.c b/app/test-pipeline/main.c
index 0be02ac..0be02ac 100644
--- a/test/test-pipeline/main.c
+++ b/app/test-pipeline/main.c
diff --git a/test/test-pipeline/main.h b/app/test-pipeline/main.h
index 59dcfdd..59dcfdd 100644
--- a/test/test-pipeline/main.h
+++ b/app/test-pipeline/main.h
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
new file mode 100644
index 0000000..5578b41
--- /dev/null
+++ b/app/test-pipeline/meson.build
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files(
+ 'config.c',
+ 'init.c',
+ 'main.c',
+ 'pipeline_acl.c',
+ 'pipeline_hash.c',
+ 'pipeline_lpm.c',
+ 'pipeline_lpm_ipv6.c',
+ 'pipeline_stub.c',
+ 'runtime.c')
+deps += 'pipeline'
diff --git a/test/test-pipeline/pipeline_acl.c b/app/test-pipeline/pipeline_acl.c
index 524d221..524d221 100644
--- a/test/test-pipeline/pipeline_acl.c
+++ b/app/test-pipeline/pipeline_acl.c
diff --git a/test/test-pipeline/pipeline_hash.c b/app/test-pipeline/pipeline_hash.c
index c201472..c201472 100644
--- a/test/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
diff --git a/test/test-pipeline/pipeline_lpm.c b/app/test-pipeline/pipeline_lpm.c
index 8add5e7..8add5e7 100644
--- a/test/test-pipeline/pipeline_lpm.c
+++ b/app/test-pipeline/pipeline_lpm.c
diff --git a/test/test-pipeline/pipeline_lpm_ipv6.c b/app/test-pipeline/pipeline_lpm_ipv6.c
index 26b3251..26b3251 100644
--- a/test/test-pipeline/pipeline_lpm_ipv6.c
+++ b/app/test-pipeline/pipeline_lpm_ipv6.c
diff --git a/test/test-pipeline/pipeline_stub.c b/app/test-pipeline/pipeline_stub.c
index b6750d5..b6750d5 100644
--- a/test/test-pipeline/pipeline_stub.c
+++ b/app/test-pipeline/pipeline_stub.c
diff --git a/test/test-pipeline/runtime.c b/app/test-pipeline/runtime.c
index 159192b..159192b 100644
--- a/test/test-pipeline/runtime.c
+++ b/app/test-pipeline/runtime.c
diff --git a/doc/guides/sample_app_ug/test_pipeline.rst b/doc/guides/sample_app_ug/test_pipeline.rst
index a9370c8..5f313c5 100644
--- a/doc/guides/sample_app_ug/test_pipeline.rst
+++ b/doc/guides/sample_app_ug/test_pipeline.rst
@@ -32,7 +32,7 @@ Compiling the Application
-------------------------
To compile the sample application see :doc:`compiling`
-The application is located in the ``$RTE_SDK/test/test-pipline`` directory.
+The application is located in the ``$RTE_SDK/app/test-pipline`` directory.
Running the Application
diff --git a/test/Makefile b/test/Makefile
index 0b7a3ed..e9ae64b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,6 +4,5 @@
include $(RTE_SDK)/mk/rte.vars.mk
DIRS-$(CONFIG_RTE_APP_TEST) += test
-DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
include $(RTE_SDK)/mk/rte.subdir.mk