[2/4] test/test-acl: move to app directory

Message ID 20190125202642.66559-3-bruce.richardson@intel.com
State New
Delegated to: Thomas Monjalon
Headers show
Series
  • RFC: consolidate testing apps to app dir
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson Jan. 25, 2019, 8:26 p.m.
Move to "app" directory and enable with meson build.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 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 -
 6 files changed, 7 insertions(+), 1 deletion(-)
 rename {test => app}/test-acl/Makefile (100%)
 rename {test => app}/test-acl/main.c (100%)
 create mode 100644 app/test-acl/meson.build

Patch

diff --git a/app/Makefile b/app/Makefile
index 3515097d9..7f397f3d5 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -7,6 +7,7 @@  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) += cmdline_test
+DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
diff --git a/app/meson.build b/app/meson.build
index 9fc9b4fdc..5865d5e01 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -4,6 +4,7 @@ 
 apps = ['cmdline_test',
 	'pdump',
 	'proc-info',
+	'test-acl',
 	'test-bbdev',
 	'test-compress-perf',
 	'test-crypto-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 000000000..6875bc128
--- /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 4ffc087a0..0b7a3ed96 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