From 75795fabd27437d399bbdf7888f0f2515a3feda4 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 26 Feb 2019 12:19:00 +0000 Subject: [PATCH] app/acl: move from test directory Move to "app" directory and enable with meson build. Signed-off-by: Bruce Richardson Acked-by: Konstantin Ananyev --- MAINTAINERS | 2 +- app/Makefile | 1 + app/meson.build | 1 + {test => app}/test-acl/Makefile | 0 {test => app}/test-acl/main.c | 0 app/test-acl/meson.build | 5 +++++ test/Makefile | 1 - 7 files changed, 8 insertions(+), 2 deletions(-) rename {test => app}/test-acl/Makefile (100%) rename {test => app}/test-acl/main.c (100%) create mode 100644 app/test-acl/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 293bf6aa49..4f34c6e4c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1106,7 +1106,7 @@ ACL M: Konstantin Ananyev 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 51237d0f4a..234e3f5043 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 8bdf4f5812..3a34ebbf3a 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 similarity index 100% rename from test/test-acl/Makefile rename to app/test-acl/Makefile diff --git a/test/test-acl/main.c b/app/test-acl/main.c similarity index 100% rename from test/test-acl/main.c rename to app/test-acl/main.c diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build new file mode 100644 index 0000000000..d5c2581b41 --- /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 4ffc087a09..0b7a3ed966 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 -- 2.20.1