summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-02-26 12:19:00 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-02-26 15:28:10 +0100
commit75795fabd27437d399bbdf7888f0f2515a3feda4 (patch)
tree0eae6788d1eab49fc1e0032de135362e0e2f7644
parent0c36081db2b0994c6e5cde3c07c358bbc092c3a3 (diff)
downloaddpdk-75795fabd27437d399bbdf7888f0f2515a3feda4.zip
dpdk-75795fabd27437d399bbdf7888f0f2515a3feda4.tar.gz
dpdk-75795fabd27437d399bbdf7888f0f2515a3feda4.tar.xz
app/acl: move from test directory
Move to "app" directory and enable with meson build. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--app/Makefile1
-rw-r--r--app/meson.build1
-rw-r--r--app/test-acl/Makefile (renamed from test/test-acl/Makefile)0
-rw-r--r--app/test-acl/main.c (renamed from test/test-acl/main.c)0
-rw-r--r--app/test-acl/meson.build5
-rw-r--r--test/Makefile1
7 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 293bf6a..4f34c6e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1106,7 +1106,7 @@ ACL
M: Konstantin Ananyev <konstantin.ananyev@intel.com>
F: lib/librte_acl/
F: doc/guides/prog_guide/packet_classif_access_ctrl.rst
-F: test/test-acl/
+F: app/test-acl/
F: test/test/test_acl.*
F: examples/l3fwd-acl/
F: doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
diff --git a/app/Makefile b/app/Makefile
index 51237d0..234e3f5 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_ACL) += test-acl
DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline
ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
diff --git a/app/meson.build b/app/meson.build
index 8bdf4f5..3a34ebb 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -4,6 +4,7 @@
apps = [
'pdump',
'proc-info',
+ 'test-acl',
'test-bbdev',
'test-cmdline',
'test-compress-perf',
diff --git a/test/test-acl/Makefile b/app/test-acl/Makefile
index 5f26294..5f26294 100644
--- a/test/test-acl/Makefile
+++ b/app/test-acl/Makefile
diff --git a/test/test-acl/main.c b/app/test-acl/main.c
index 648525a..648525a 100644
--- a/test/test-acl/main.c
+++ b/app/test-acl/main.c
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
new file mode 100644
index 0000000..d5c2581
--- /dev/null
+++ b/app/test-acl/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('main.c')
+deps += ['acl', 'net']
diff --git a/test/Makefile b/test/Makefile
index 4ffc087..0b7a3ed 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,7 +4,6 @@
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
include $(RTE_SDK)/mk/rte.subdir.mk