Move to the app directory, and add to meson build.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
app/Makefile | 1 +
app/meson.build | 1 +
{test => app}/test-pipeline/Makefile | 0
{test => app}/test-pipeline/config.c | 0
{test => app}/test-pipeline/init.c | 0
{test => app}/test-pipeline/main.c | 0
{test => app}/test-pipeline/main.h | 0
app/test-pipeline/meson.build | 14 ++++++++++++++
{test => app}/test-pipeline/pipeline_acl.c | 0
{test => app}/test-pipeline/pipeline_hash.c | 0
{test => app}/test-pipeline/pipeline_lpm.c | 0
{test => app}/test-pipeline/pipeline_lpm_ipv6.c | 0
{test => app}/test-pipeline/pipeline_stub.c | 0
{test => app}/test-pipeline/runtime.c | 0
test/Makefile | 1 -
15 files changed, 16 insertions(+), 1 deletion(-)
rename {test => app}/test-pipeline/Makefile (100%)
rename {test => app}/test-pipeline/config.c (100%)
rename {test => app}/test-pipeline/init.c (100%)
rename {test => app}/test-pipeline/main.c (100%)
rename {test => app}/test-pipeline/main.h (100%)
create mode 100644 app/test-pipeline/meson.build
rename {test => app}/test-pipeline/pipeline_acl.c (100%)
rename {test => app}/test-pipeline/pipeline_hash.c (100%)
rename {test => app}/test-pipeline/pipeline_lpm.c (100%)
rename {test => app}/test-pipeline/pipeline_lpm_ipv6.c (100%)
rename {test => app}/test-pipeline/pipeline_stub.c (100%)
rename {test => app}/test-pipeline/runtime.c (100%)
diff --git a/app/Makefile b/app/Makefile
index 7f397f3d5..2940ac38f 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_CMDLINE) += cmdline_test
DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
+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 5865d5e01..6053af7c1 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -9,6 +9,7 @@ apps = ['cmdline_test',
'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
similarity index 100%
rename from test/test-pipeline/Makefile
rename to app/test-pipeline/Makefile
diff --git a/test/test-pipeline/config.c b/app/test-pipeline/config.c
similarity index 100%
rename from test/test-pipeline/config.c
rename to app/test-pipeline/config.c
diff --git a/test/test-pipeline/init.c b/app/test-pipeline/init.c
similarity index 100%
rename from test/test-pipeline/init.c
rename to app/test-pipeline/init.c
diff --git a/test/test-pipeline/main.c b/app/test-pipeline/main.c
similarity index 100%
rename from test/test-pipeline/main.c
rename to app/test-pipeline/main.c
diff --git a/test/test-pipeline/main.h b/app/test-pipeline/main.h
similarity index 100%
rename from test/test-pipeline/main.h
rename to app/test-pipeline/main.h
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
new file mode 100644
index 000000000..274391c61
--- /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
similarity index 100%
rename from test/test-pipeline/pipeline_acl.c
rename to app/test-pipeline/pipeline_acl.c
diff --git a/test/test-pipeline/pipeline_hash.c
b/app/test-pipeline/pipeline_hash.c
similarity index 100%
rename from test/test-pipeline/pipeline_hash.c
rename to app/test-pipeline/pipeline_hash.c
diff --git a/test/test-pipeline/pipeline_lpm.c
b/app/test-pipeline/pipeline_lpm.c
similarity index 100%
rename from test/test-pipeline/pipeline_lpm.c
rename to app/test-pipeline/pipeline_lpm.c
diff --git a/test/test-pipeline/pipeline_lpm_ipv6.c
b/app/test-pipeline/pipeline_lpm_ipv6.c
similarity index 100%
rename from test/test-pipeline/pipeline_lpm_ipv6.c
rename to app/test-pipeline/pipeline_lpm_ipv6.c
diff --git a/test/test-pipeline/pipeline_stub.c
b/app/test-pipeline/pipeline_stub.c
similarity index 100%
rename from test/test-pipeline/pipeline_stub.c
rename to app/test-pipeline/pipeline_stub.c
diff --git a/test/test-pipeline/runtime.c b/app/test-pipeline/runtime.c
similarity index 100%
rename from test/test-pipeline/runtime.c
rename to app/test-pipeline/runtime.c
diff --git a/test/Makefile b/test/Makefile
index 0b7a3ed96..e9ae64b59 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
--
2.20.1
