[v3,2/5] test/test-acl: move to app directory

Message ID 20190226121903.5499-3-bruce.richardson@intel.com
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • 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 Feb. 26, 2019, 12:19 p.m.
Move to "app" directory and enable with meson build.

CC: Konstantin Ananyev <konstantin.ananyev@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 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

Comments

Ananyev, Konstantin Feb. 26, 2019, 12:27 p.m. | #1
> -----Original Message-----
> From: Richardson, Bruce
> Sent: Tuesday, February 26, 2019 12:19 PM
> To: thomas@monjalon.net
> Cc: dev@dpdk.org; Richardson, Bruce <bruce.richardson@intel.com>; Ananyev, Konstantin <konstantin.ananyev@intel.com>
> Subject: [PATCH v3 2/5] test/test-acl: move to app directory
> 
> Move to "app" directory and enable with meson build.
> 
> CC: Konstantin Ananyev <konstantin.ananyev@intel.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  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 293bf6aa4..4f34c6e4c 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 51237d0f4..234e3f504 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 8bdf4f581..3a34ebbf3 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 000000000..d5c2581b4
> --- /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
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> 2.20.1

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 293bf6aa4..4f34c6e4c 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 51237d0f4..234e3f504 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 8bdf4f581..3a34ebbf3 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 000000000..d5c2581b4
--- /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