Skip to contentSkip to conversation

RFC: consolidate testing apps to app dir

PATCH Superseded Bruce Richardson 4 participants 33 messages Jan 25, 2019 – Feb 26, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover RFC: consolidate testing apps to app dir

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only.

Bruce Richardson (4):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder

 app/Makefile                                    |  3 +++
 {test => app}/cmdline_test/Makefile             |  0
 {test => app}/cmdline_test/cmdline_test.c       |  0
 {test => app}/cmdline_test/cmdline_test.h       |  0
 {test => app}/cmdline_test/cmdline_test.py      |  0
 {test => app}/cmdline_test/cmdline_test_data.py |  0
 {test => app}/cmdline_test/commands.c           |  0
 app/cmdline_test/meson.build                    |  5 +++++
 app/meson.build                                 |  5 ++++-
 {test => app}/test-acl/Makefile                 |  0
 {test => app}/test-acl/main.c                   |  0
 app/test-acl/meson.build                        |  5 +++++
 {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
 doc/guides/testpmd_app_ug/testpmd_funcs.rst     |  8 ++++----
 examples/bpf/README                             |  8 ++++++++
 {test => examples}/bpf/dummy.c                  |  0
 {test => examples}/bpf/mbuf.h                   |  0
 examples/bpf/meson.build                        |  6 ++++++
 {test => examples}/bpf/t1.c                     |  0
 {test => examples}/bpf/t2.c                     |  0
 {test => examples}/bpf/t3.c                     |  0
 test/Makefile                                   |  3 ---
 33 files changed, 49 insertions(+), 8 deletions(-)
 rename {test => app}/cmdline_test/Makefile (100%)
 rename {test => app}/cmdline_test/cmdline_test.c (100%)
 rename {test => app}/cmdline_test/cmdline_test.h (100%)
 rename {test => app}/cmdline_test/cmdline_test.py (100%)
 rename {test => app}/cmdline_test/cmdline_test_data.py (100%)
 rename {test => app}/cmdline_test/commands.c (100%)
 create mode 100644 app/cmdline_test/meson.build
 rename {test => app}/test-acl/Makefile (100%)
 rename {test => app}/test-acl/main.c (100%)
 create mode 100644 app/test-acl/meson.build
 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%)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/4 test/cmdline_test: move to app directory

Move app to "app" directory and enable with meson build.

---
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0
 app/cmdline_test/meson.build                    | 5 +++++
 app/meson.build                                 | 3 ++-
 test/Makefile                                   | 1 -
 10 files changed, 8 insertions(+), 2 deletions(-)
 rename {test => app}/cmdline_test/Makefile (100%)
 rename {test => app}/cmdline_test/cmdline_test.c (100%)
 rename {test => app}/cmdline_test/cmdline_test.h (100%)
 rename {test => app}/cmdline_test/cmdline_test.py (100%)
 rename {test => app}/cmdline_test/cmdline_test_data.py (100%)
 rename {test => app}/cmdline_test/commands.c (100%)
 create mode 100644 app/cmdline_test/meson.build
app/Makefile +1 -0
index d6641ef1c..3515097d9 100644
@@ -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_CMDLINE) += cmdline_test
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
app/cmdline_test/Makefile renamed from test/cmdline_test/Makefile +0 -0
similarity index 100%
rename from test/cmdline_test/Makefile
rename to app/cmdline_test/Makefile
app/cmdline_test/cmdline_test.c renamed from test/cmdline_test/cmdline_test.c +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.c
rename to app/cmdline_test/cmdline_test.c
app/cmdline_test/cmdline_test.h renamed from test/cmdline_test/cmdline_test.h +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.h
rename to app/cmdline_test/cmdline_test.h
app/cmdline_test/cmdline_test.py renamed from test/cmdline_test/cmdline_test.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.py
rename to app/cmdline_test/cmdline_test.py
app/cmdline_test/cmdline_test_data.py renamed from test/cmdline_test/cmdline_test_data.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test_data.py
rename to app/cmdline_test/cmdline_test_data.py
app/cmdline_test/commands.c renamed from test/cmdline_test/commands.c +0 -0
similarity index 100%
rename from test/cmdline_test/commands.c
rename to app/cmdline_test/commands.c
app/cmdline_test/meson.build new file +5 -0
new file mode 100644
index 000000000..47d3f3791
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('commands.c', 'cmdline_test.c')
+deps += 'cmdline'
app/meson.build +2 -1
index 47a2a8615..9fc9b4fdc 100644
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-apps = ['pdump',
+apps = ['cmdline_test',
+	'pdump',
 	'proc-info',
 	'test-bbdev',
 	'test-compress-perf',
test/Makefile +0 -1
index 6656374fc..4ffc087a0 100644
@@ -6,6 +6,5 @@ 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
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test
 
 include $(RTE_SDK)/mk/rte.subdir.mk
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/4 test/test-acl: move to app directory

In reply to Bruce Richardson

Move to "app" directory and enable with meson build.

---
 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
app/Makefile +1 -0
index 3515097d9..7f397f3d5 100644
@@ -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
app/meson.build +1 -0
index 9fc9b4fdc..5865d5e01 100644
@@ -4,6 +4,7 @@
 apps = ['cmdline_test',
 	'pdump',
 	'proc-info',
+	'test-acl',
 	'test-bbdev',
 	'test-compress-perf',
 	'test-crypto-perf',
app/test-acl/Makefile renamed from test/test-acl/Makefile +0 -0
similarity index 100%
rename from test/test-acl/Makefile
rename to app/test-acl/Makefile
app/test-acl/main.c renamed from test/test-acl/main.c +0 -0
similarity index 100%
rename from test/test-acl/main.c
rename to app/test-acl/main.c
app/test-acl/meson.build new file +5 -0
new file mode 100644
index 000000000..6875bc128
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('main.c')
+deps += ['acl', 'net']
test/Makefile +0 -1
index 4ffc087a0..0b7a3ed96 100644
@@ -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
Signature · 1 line
2.20.1
#3 lore raw

PATCH 3/4 test/test-pipeline: move to app directory

In reply to Bruce Richardson

Move to the app directory, and add to meson build.

---
 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%)
app/Makefile +1 -0
index 7f397f3d5..2940ac38f 100644
@@ -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
app/meson.build +1 -0
index 5865d5e01..6053af7c1 100644
@@ -9,6 +9,7 @@ apps = ['cmdline_test',
 	'test-compress-perf',
 	'test-crypto-perf',
 	'test-eventdev',
+	'test-pipeline',
 	'test-pmd']
 
 # for BSD only
app/test-pipeline/Makefile renamed from test/test-pipeline/Makefile +0 -0
similarity index 100%
rename from test/test-pipeline/Makefile
rename to app/test-pipeline/Makefile
app/test-pipeline/config.c renamed from test/test-pipeline/config.c +0 -0
similarity index 100%
rename from test/test-pipeline/config.c
rename to app/test-pipeline/config.c
app/test-pipeline/init.c renamed from test/test-pipeline/init.c +0 -0
similarity index 100%
rename from test/test-pipeline/init.c
rename to app/test-pipeline/init.c
app/test-pipeline/main.c renamed from test/test-pipeline/main.c +0 -0
similarity index 100%
rename from test/test-pipeline/main.c
rename to app/test-pipeline/main.c
app/test-pipeline/main.h renamed from test/test-pipeline/main.h +0 -0
similarity index 100%
rename from test/test-pipeline/main.h
rename to app/test-pipeline/main.h
app/test-pipeline/meson.build new file +14 -0
new file mode 100644
index 000000000..274391c61
@@ -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'
app/test-pipeline/pipeline_acl.c renamed from test/test-pipeline/pipeline_acl.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_acl.c
rename to app/test-pipeline/pipeline_acl.c
app/test-pipeline/pipeline_hash.c renamed from test/test-pipeline/pipeline_hash.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_hash.c
rename to app/test-pipeline/pipeline_hash.c
app/test-pipeline/pipeline_lpm.c renamed from test/test-pipeline/pipeline_lpm.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm.c
rename to app/test-pipeline/pipeline_lpm.c
app/test-pipeline/pipeline_lpm_ipv6.c renamed from test/test-pipeline/pipeline_lpm_ipv6.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm_ipv6.c
rename to app/test-pipeline/pipeline_lpm_ipv6.c
app/test-pipeline/pipeline_stub.c renamed from test/test-pipeline/pipeline_stub.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_stub.c
rename to app/test-pipeline/pipeline_stub.c
app/test-pipeline/runtime.c renamed from test/test-pipeline/runtime.c +0 -0
similarity index 100%
rename from test/test-pipeline/runtime.c
rename to app/test-pipeline/runtime.c
test/Makefile +0 -1
index 0b7a3ed96..e9ae64b59 100644
@@ -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
Signature · 1 line
2.20.1
#4 lore raw

PATCH 4/4 test/bpf: move to examples folder

In reply to Bruce Richardson

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd. Therefore we can move it to the examples folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated.

---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
 examples/bpf/README                         | 8 ++++++++
 {test => examples}/bpf/dummy.c              | 0
 {test => examples}/bpf/mbuf.h               | 0
 examples/bpf/meson.build                    | 6 ++++++
 {test => examples}/bpf/t1.c                 | 0
 {test => examples}/bpf/t2.c                 | 0
 {test => examples}/bpf/t3.c                 | 0
 8 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -4
index 854af2d5f..ad382ddb3 100644
@@ -4487,20 +4487,20 @@ For example:
 
 .. code-block:: console
 
-   cd test/bpf
+   cd examples/bpf
    clang -O2 -target bpf -c t1.c
 
 Then to load (and JIT compile) t1.o at RX queue 0, port 1::
 
 .. code-block:: console
 
-   testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
 
 To load (not JITed) t1.o at TX queue 0, port 0::
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o
 
 bpf-unload
 ~~~~~~~~~~
@@ -4513,4 +4513,4 @@ For example to unload BPF filter from TX queue 0, port 0:
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-unload tx 0 0
examples/bpf/README new file +8 -0
new file mode 100644
index 000000000..d714180a5
@@ -0,0 +1,8 @@
+This folder contains example BPF programs for use with the DPDK bpf
+library. To get details of each program and how to compile it, see
+the header on the '.c' file itself.
+
+Once compiled, these example programs can be loaded into `testpmd`
+for execution on a packet stream. See `bpf-load` and `bpf-unload`
+commands documented in the `Testpmd Application User Guide` for
+details on how to do so.
examples/bpf/dummy.c renamed from test/bpf/dummy.c +0 -0
similarity index 100%
rename from test/bpf/dummy.c
rename to examples/bpf/dummy.c
examples/bpf/mbuf.h renamed from test/bpf/mbuf.h +0 -0
similarity index 100%
rename from test/bpf/mbuf.h
rename to examples/bpf/mbuf.h
examples/bpf/meson.build new file +6 -0
new file mode 100644
index 000000000..bf1c4f831
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+# This contains BPF example code for use in testing BPF with testpmd,
+# therefore it should not be built as part of a meson build.
+build=false
examples/bpf/t1.c renamed from test/bpf/t1.c +0 -0
similarity index 100%
rename from test/bpf/t1.c
rename to examples/bpf/t1.c
examples/bpf/t2.c renamed from test/bpf/t2.c +0 -0
similarity index 100%
rename from test/bpf/t2.c
rename to examples/bpf/t2.c
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -0
similarity index 100%
rename from test/bpf/t3.c
rename to examples/bpf/t3.c
Signature · 1 line
2.20.1
#5 lore raw
In reply to Bruce Richardson
Quoted 15 lines · Bruce Richardson

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only.

Quoted 6 lines

Bruce Richardson (4):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder

Although these patches are for 19.05, I'm sending them now for some early review, as I think we need a deprecation notice for this change in 19.02 if these changes are acceptable to people.

Therefore, please review and let me know any issues people see with this change.

/Bruce

#6 lore raw

25/01/2019 21:30, Bruce Richardson:

Quoted 23 lines · Bruce Richardson
Quoted 15 lines

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only.

Quoted 6 lines

Bruce Richardson (4):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder

Quoted 3 lines

Although these patches are for 19.05, I'm sending them now for some early review, as I think we need a deprecation notice for this change in 19.02 if these changes are acceptable to people.

We don't need a deprecation notice, as it is an internal change without any impact for the users.

Quoted 2 lines

Therefore, please review and let me know any issues people see with this change.

We should move all test apps into the same directory. Is there any benefit of keeping unit tests separate? It looks more logic to move everything in test/ but it would make the git history of testpmd more complex. The other choice is to move all tests in app/.

The other split to discuss is between app/ and usertools/. We could move user-oriented apps to usertools. pdump and proc-info fall into this basket because they can be used for debugging purpose.

#7 lore raw
Quoted 24 lines · Thomas Monjalon

25/01/2019 21:30, Bruce Richardson:

Quoted 23 lines · Bruce Richardson
Quoted 21 lines

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only.

Bruce Richardson (4):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder

Quoted 7 lines
Quoted 3 lines

Although these patches are for 19.05, I'm sending them now for some early review, as I think we need a deprecation notice for this change in 19.02 if these changes are acceptable to people.

We don't need a deprecation notice, as it is an internal change without any impact for the users.

Yes, good point. With the make build system these test apps end up in the app folder anyway. With meson, they aren't yet built, so either way it isn't a user-visible change.

Quoted 9 lines
Quoted 2 lines

Therefore, please review and let me know any issues people see with this change.

We should move all test apps into the same directory. Is there any benefit of keeping unit tests separate? It looks more logic to move everything in test/ but it would make the git history of testpmd more complex. The other choice is to move all tests in app/.

I'd prefer to keep things in app, for legacy reasons more than anything else. Not sure about moving the unit tests there too - I sort of like having them in a separate test directory. However, if others generally prefer that they too get consolidated into app, I won't complain! :-)

If we do end up moving the tests, another thing to consider is whether we want to split them up by topic or suite. There are now a lot of C files in the test folder, which suggests to me we need to split things a little.

Quoted 5 lines

The other split to discuss is between app/ and usertools/. We could move user-oriented apps to usertools. pdump and proc-info fall into this basket because they can be used for debugging purpose.

Yes. However, is this better handled via the installation rather than the build? Even if the source code is moved to the usertools directory, the actual binaries are going to be placed in the build folder, separate from the scripts anyway. I'd suggest leaving them as they are, though perhaps putting in a symlink to them from the usertools folder to make them easier to find.

/Bruce

#8 lore raw

v2 cover consolidate testing apps to app dir

In reply to Bruce Richardson

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only. However, we can simplify things a little by moving that too to the app folder, eliminating the need for the separate "test-build" make target, and aligning the output folder for the binary from "make test-build" with the source file location in app.

---
V2: * Following some discussion with Thomas, moved the autotests to the
app folder too.
* Updated maintainers file appropriately in each patch.

Bruce Richardson (5):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder
test/test: move to app folder

 GNUmakefile                                   |   1 -
 MAINTAINERS                                   | 190 +++++++++---------
 app/Makefile                                  |   4 +
 {test => app}/cmdline_test/Makefile           |   0
 {test => app}/cmdline_test/cmdline_test.c     |   0
 {test => app}/cmdline_test/cmdline_test.h     |   0
 {test => app}/cmdline_test/cmdline_test.py    |   0
 .../cmdline_test/cmdline_test_data.py         |   0
 {test => app}/cmdline_test/commands.c         |   0
 app/cmdline_test/meson.build                  |   5 +
 app/meson.build                               |   8 +-
 {test => app}/test-acl/Makefile               |   0
 {test => app}/test-acl/main.c                 |   0
 app/test-acl/meson.build                      |   5 +
 {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-pipeline/pipeline_lpm_ipv6.c         |   0
 {test => app}/test-pipeline/pipeline_stub.c   |   0
 {test => app}/test-pipeline/runtime.c         |   0
 {test => app}/test/Makefile                   |   0
 {test => app}/test/autotest.py                |   0
 {test => app}/test/autotest_data.py           |   0
 {test => app}/test/autotest_runner.py         |   0
 {test => app}/test/autotest_test_funcs.py     |   0
 {test => app}/test/commands.c                 |   0
 {test => app}/test/meson.build                |   0
 {test => app}/test/packet_burst_generator.c   |   0
 {test => app}/test/packet_burst_generator.h   |   0
 {test => app}/test/process.h                  |   0
 {test => app}/test/resource.c                 |   0
 {test => app}/test/resource.h                 |   0
 {test => app}/test/sample_packet_forward.c    |   0
 {test => app}/test/sample_packet_forward.h    |   0
 {test => app}/test/test.c                     |   0
 {test => app}/test/test.h                     |   0
 {test => app}/test/test_acl.c                 |   0
 {test => app}/test/test_acl.h                 |   0
 {test => app}/test/test_alarm.c               |   0
 {test => app}/test/test_atomic.c              |   0
 {test => app}/test/test_barrier.c             |   0
 {test => app}/test/test_bitmap.c              |   0
 {test => app}/test/test_bitratestats.c        |   0
 {test => app}/test/test_bpf.c                 |   0
 {test => app}/test/test_byteorder.c           |   0
 {test => app}/test/test_cfgfile.c             |   0
 .../test/test_cfgfiles/etc/empty.ini          |   0
 .../test_cfgfiles/etc/empty_key_value.ini     |   0
 .../test_cfgfiles/etc/invalid_section.ini     |   0
 .../test/test_cfgfiles/etc/line_too_long.ini  |   0
 .../test_cfgfiles/etc/missing_section.ini     |   0
 .../test_cfgfiles/etc/realloc_sections.ini    |   0
 .../test/test_cfgfiles/etc/sample1.ini        |   0
 .../test/test_cfgfiles/etc/sample2.ini        |   0
 {test => app}/test/test_cmdline.c             |   0
 {test => app}/test/test_cmdline.h             |   0
 {test => app}/test/test_cmdline_cirbuf.c      |   0
 {test => app}/test/test_cmdline_etheraddr.c   |   0
 {test => app}/test/test_cmdline_ipaddr.c      |   0
 {test => app}/test/test_cmdline_lib.c         |   0
 {test => app}/test/test_cmdline_num.c         |   0
 {test => app}/test/test_cmdline_portlist.c    |   0
 {test => app}/test/test_cmdline_string.c      |   0
 {test => app}/test/test_common.c              |   0
 {test => app}/test/test_compressdev.c         |   0
 .../test/test_compressdev_test_buffer.h       |   0
 {test => app}/test/test_cpuflags.c            |   0
 {test => app}/test/test_crc.c                 |   0
 {test => app}/test/test_cryptodev.c           |   0
 {test => app}/test/test_cryptodev.h           |   0
 .../test/test_cryptodev_aead_test_vectors.h   |   0
 .../test/test_cryptodev_aes_test_vectors.h    |   0
 {test => app}/test/test_cryptodev_asym.c      |   0
 {test => app}/test/test_cryptodev_asym_util.h |   0
 .../test/test_cryptodev_blockcipher.c         |   0
 .../test/test_cryptodev_blockcipher.h         |   0
 .../test/test_cryptodev_des_test_vectors.h    |   0
 .../test/test_cryptodev_dh_test_vectors.h     |   0
 .../test/test_cryptodev_dsa_test_vectors.h    |   0
 .../test/test_cryptodev_hash_test_vectors.h   |   0
 .../test/test_cryptodev_hmac_test_vectors.h   |   0
 .../test_cryptodev_kasumi_hash_test_vectors.h |   0
 .../test/test_cryptodev_kasumi_test_vectors.h |   0
 .../test/test_cryptodev_mod_test_vectors.h    |   0
 .../test/test_cryptodev_rsa_test_vectors.h    |   0
 .../test_cryptodev_snow3g_hash_test_vectors.h |   0
 .../test/test_cryptodev_snow3g_test_vectors.h |   0
 .../test/test_cryptodev_zuc_test_vectors.h    |   0
 {test => app}/test/test_cycles.c              |   0
 {test => app}/test/test_debug.c               |   0
 {test => app}/test/test_distributor.c         |   0
 {test => app}/test/test_distributor_perf.c    |   0
 {test => app}/test/test_eal_flags.c           |   0
 {test => app}/test/test_eal_fs.c              |   0
 {test => app}/test/test_efd.c                 |   0
 {test => app}/test/test_efd_perf.c            |   0
 {test => app}/test/test_errno.c               |   0
 .../test/test_event_crypto_adapter.c          |   0
 .../test/test_event_eth_rx_adapter.c          |   0
 .../test/test_event_eth_tx_adapter.c          |   0
 {test => app}/test/test_event_ring.c          |   0
 {test => app}/test/test_event_timer_adapter.c |   0
 {test => app}/test/test_eventdev.c            |   0
 {test => app}/test/test_external_mem.c        |   0
 {test => app}/test/test_fbarray.c             |   0
 {test => app}/test/test_flow_classify.c       |   0
 {test => app}/test/test_flow_classify.h       |   0
 {test => app}/test/test_func_reentrancy.c     |   0
 {test => app}/test/test_hash.c                |   0
 {test => app}/test/test_hash_functions.c      |   0
 {test => app}/test/test_hash_multiwriter.c    |   0
 {test => app}/test/test_hash_perf.c           |   0
 {test => app}/test/test_hash_readwrite.c      |   0
 {test => app}/test/test_hash_readwrite_lf.c   |   0
 {test => app}/test/test_interrupts.c          |   0
 {test => app}/test/test_ipsec.c               |   0
 {test => app}/test/test_kni.c                 |   0
 {test => app}/test/test_kvargs.c              |   0
 {test => app}/test/test_latencystats.c        |   0
 {test => app}/test/test_link_bonding.c        |   0
 {test => app}/test/test_link_bonding_mode4.c  |   0
 .../test/test_link_bonding_rssconf.c          |   0
 {test => app}/test/test_logs.c                |   0
 {test => app}/test/test_lpm.c                 |   0
 {test => app}/test/test_lpm6.c                |   0
 {test => app}/test/test_lpm6_data.h           |   0
 {test => app}/test/test_lpm6_perf.c           |   0
 {test => app}/test/test_lpm_perf.c            |   0
 {test => app}/test/test_malloc.c              |   0
 {test => app}/test/test_mbuf.c                |   0
 {test => app}/test/test_member.c              |   0
 {test => app}/test/test_member_perf.c         |   0
 {test => app}/test/test_memcpy.c              |   0
 {test => app}/test/test_memcpy_perf.c         |   0
 {test => app}/test/test_memory.c              |   0
 {test => app}/test/test_mempool.c             |   0
 {test => app}/test/test_mempool_perf.c        |   0
 {test => app}/test/test_memzone.c             |   0
 {test => app}/test/test_meter.c               |   0
 {test => app}/test/test_metrics.c             |   0
 {test => app}/test/test_mp_secondary.c        |   0
 {test => app}/test/test_pdump.c               |   0
 {test => app}/test/test_pdump.h               |   0
 {test => app}/test/test_per_lcore.c           |   0
 {test => app}/test/test_pmd_perf.c            |   0
 {test => app}/test/test_pmd_ring.c            |   0
 {test => app}/test/test_pmd_ring_perf.c       |   0
 {test => app}/test/test_power.c               |   0
 {test => app}/test/test_power_acpi_cpufreq.c  |   0
 {test => app}/test/test_power_kvm_vm.c        |   0
 {test => app}/test/test_prefetch.c            |   0
 {test => app}/test/test_rawdev.c              |   0
 {test => app}/test/test_reciprocal_division.c |   0
 .../test/test_reciprocal_division_perf.c      |   0
 {test => app}/test/test_red.c                 |   0
 {test => app}/test/test_reorder.c             |   0
 {test => app}/test/test_resource.c            |   0
 {test => app}/test/test_ring.c                |   0
 {test => app}/test/test_ring_perf.c           |   0
 {test => app}/test/test_rwlock.c              |   0
 {test => app}/test/test_sched.c               |   0
 {test => app}/test/test_service_cores.c       |   0
 {test => app}/test/test_spinlock.c            |   0
 {test => app}/test/test_string_fns.c          |   0
 {test => app}/test/test_table.c               |   0
 {test => app}/test/test_table.h               |   0
 {test => app}/test/test_table_acl.c           |   0
 {test => app}/test/test_table_acl.h           |   0
 {test => app}/test/test_table_combined.c      |   0
 {test => app}/test/test_table_combined.h      |   0
 {test => app}/test/test_table_pipeline.c      |   0
 {test => app}/test/test_table_pipeline.h      |   0
 {test => app}/test/test_table_ports.c         |   0
 {test => app}/test/test_table_ports.h         |   0
 {test => app}/test/test_table_tables.c        |   0
 {test => app}/test/test_table_tables.h        |   0
 {test => app}/test/test_tailq.c               |   0
 {test => app}/test/test_thash.c               |   0
 {test => app}/test/test_timer.c               |   0
 {test => app}/test/test_timer_perf.c          |   0
 {test => app}/test/test_timer_racecond.c      |   0
 {test => app}/test/test_version.c             |   0
 {test => app}/test/test_xmmt_ops.h            |   0
 {test => app}/test/virtual_pmd.c              |   0
 {test => app}/test/virtual_pmd.h              |   0
 devtools/test-build.sh                        |   3 -
 doc/guides/compressdevs/octeontx.rst          |   2 +-
 doc/guides/cryptodevs/qat.rst                 |   4 +-
 doc/guides/cryptodevs/virtio.rst              |   2 +-
 doc/guides/mempool/octeontx.rst               |   2 +-
 doc/guides/prog_guide/compressdev.rst         |   2 +-
 doc/guides/sample_app_ug/test_pipeline.rst    |   2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst   |   8 +-
 examples/bpf/README                           |   8 +
 {test => examples}/bpf/dummy.c                |   0
 {test => examples}/bpf/mbuf.h                 |   0
 examples/bpf/meson.build                      |   6 +
 {test => examples}/bpf/t1.c                   |   0
 {test => examples}/bpf/t2.c                   |   0
 {test => examples}/bpf/t3.c                   |   0
 meson.build                                   |   1 -
 mk/rte.sdkbuild.mk                            |   3 -
 mk/rte.sdkroot.mk                             |   6 +-
 mk/rte.sdktest.mk                             |   8 +-
 test/Makefile                                 |  11 -
 test/meson.build                              |   4 -
 212 files changed, 161 insertions(+), 138 deletions(-)
 rename {test => app}/cmdline_test/Makefile (100%)
 rename {test => app}/cmdline_test/cmdline_test.c (100%)
 rename {test => app}/cmdline_test/cmdline_test.h (100%)
 rename {test => app}/cmdline_test/cmdline_test.py (100%)
 rename {test => app}/cmdline_test/cmdline_test_data.py (100%)
 rename {test => app}/cmdline_test/commands.c (100%)
 create mode 100644 app/cmdline_test/meson.build
 rename {test => app}/test-acl/Makefile (100%)
 rename {test => app}/test-acl/main.c (100%)
 create mode 100644 app/test-acl/meson.build
 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%)
 rename {test => app}/test/Makefile (100%)
 rename {test => app}/test/autotest.py (100%)
 rename {test => app}/test/autotest_data.py (100%)
 rename {test => app}/test/autotest_runner.py (100%)
 rename {test => app}/test/autotest_test_funcs.py (100%)
 rename {test => app}/test/commands.c (100%)
 rename {test => app}/test/meson.build (100%)
 rename {test => app}/test/packet_burst_generator.c (100%)
 rename {test => app}/test/packet_burst_generator.h (100%)
 rename {test => app}/test/process.h (100%)
 rename {test => app}/test/resource.c (100%)
 rename {test => app}/test/resource.h (100%)
 rename {test => app}/test/sample_packet_forward.c (100%)
 rename {test => app}/test/sample_packet_forward.h (100%)
 rename {test => app}/test/test.c (100%)
 rename {test => app}/test/test.h (100%)
 rename {test => app}/test/test_acl.c (100%)
 rename {test => app}/test/test_acl.h (100%)
 rename {test => app}/test/test_alarm.c (100%)
 rename {test => app}/test/test_atomic.c (100%)
 rename {test => app}/test/test_barrier.c (100%)
 rename {test => app}/test/test_bitmap.c (100%)
 rename {test => app}/test/test_bitratestats.c (100%)
 rename {test => app}/test/test_bpf.c (100%)
 rename {test => app}/test/test_byteorder.c (100%)
 rename {test => app}/test/test_cfgfile.c (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty_key_value.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/invalid_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/line_too_long.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/missing_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/realloc_sections.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample1.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample2.ini (100%)
 rename {test => app}/test/test_cmdline.c (100%)
 rename {test => app}/test/test_cmdline.h (100%)
 rename {test => app}/test/test_cmdline_cirbuf.c (100%)
 rename {test => app}/test/test_cmdline_etheraddr.c (100%)
 rename {test => app}/test/test_cmdline_ipaddr.c (100%)
 rename {test => app}/test/test_cmdline_lib.c (100%)
 rename {test => app}/test/test_cmdline_num.c (100%)
 rename {test => app}/test/test_cmdline_portlist.c (100%)
 rename {test => app}/test/test_cmdline_string.c (100%)
 rename {test => app}/test/test_common.c (100%)
 rename {test => app}/test/test_compressdev.c (100%)
 rename {test => app}/test/test_compressdev_test_buffer.h (100%)
 rename {test => app}/test/test_cpuflags.c (100%)
 rename {test => app}/test/test_crc.c (100%)
 rename {test => app}/test/test_cryptodev.c (100%)
 rename {test => app}/test/test_cryptodev.h (100%)
 rename {test => app}/test/test_cryptodev_aead_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_aes_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_asym.c (100%)
 rename {test => app}/test/test_cryptodev_asym_util.h (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.c (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.h (100%)
 rename {test => app}/test/test_cryptodev_des_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dh_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hmac_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_mod_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_rsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_zuc_test_vectors.h (100%)
 rename {test => app}/test/test_cycles.c (100%)
 rename {test => app}/test/test_debug.c (100%)
 rename {test => app}/test/test_distributor.c (100%)
 rename {test => app}/test/test_distributor_perf.c (100%)
 rename {test => app}/test/test_eal_flags.c (100%)
 rename {test => app}/test/test_eal_fs.c (100%)
 rename {test => app}/test/test_efd.c (100%)
 rename {test => app}/test/test_efd_perf.c (100%)
 rename {test => app}/test/test_errno.c (100%)
 rename {test => app}/test/test_event_crypto_adapter.c (100%)
 rename {test => app}/test/test_event_eth_rx_adapter.c (100%)
 rename {test => app}/test/test_event_eth_tx_adapter.c (100%)
 rename {test => app}/test/test_event_ring.c (100%)
 rename {test => app}/test/test_event_timer_adapter.c (100%)
 rename {test => app}/test/test_eventdev.c (100%)
 rename {test => app}/test/test_external_mem.c (100%)
 rename {test => app}/test/test_fbarray.c (100%)
 rename {test => app}/test/test_flow_classify.c (100%)
 rename {test => app}/test/test_flow_classify.h (100%)
 rename {test => app}/test/test_func_reentrancy.c (100%)
 rename {test => app}/test/test_hash.c (100%)
 rename {test => app}/test/test_hash_functions.c (100%)
 rename {test => app}/test/test_hash_multiwriter.c (100%)
 rename {test => app}/test/test_hash_perf.c (100%)
 rename {test => app}/test/test_hash_readwrite.c (100%)
 rename {test => app}/test/test_hash_readwrite_lf.c (100%)
 rename {test => app}/test/test_interrupts.c (100%)
 rename {test => app}/test/test_ipsec.c (100%)
 rename {test => app}/test/test_kni.c (100%)
 rename {test => app}/test/test_kvargs.c (100%)
 rename {test => app}/test/test_latencystats.c (100%)
 rename {test => app}/test/test_link_bonding.c (100%)
 rename {test => app}/test/test_link_bonding_mode4.c (100%)
 rename {test => app}/test/test_link_bonding_rssconf.c (100%)
 rename {test => app}/test/test_logs.c (100%)
 rename {test => app}/test/test_lpm.c (100%)
 rename {test => app}/test/test_lpm6.c (100%)
 rename {test => app}/test/test_lpm6_data.h (100%)
 rename {test => app}/test/test_lpm6_perf.c (100%)
 rename {test => app}/test/test_lpm_perf.c (100%)
 rename {test => app}/test/test_malloc.c (100%)
 rename {test => app}/test/test_mbuf.c (100%)
 rename {test => app}/test/test_member.c (100%)
 rename {test => app}/test/test_member_perf.c (100%)
 rename {test => app}/test/test_memcpy.c (100%)
 rename {test => app}/test/test_memcpy_perf.c (100%)
 rename {test => app}/test/test_memory.c (100%)
 rename {test => app}/test/test_mempool.c (100%)
 rename {test => app}/test/test_mempool_perf.c (100%)
 rename {test => app}/test/test_memzone.c (100%)
 rename {test => app}/test/test_meter.c (100%)
 rename {test => app}/test/test_metrics.c (100%)
 rename {test => app}/test/test_mp_secondary.c (100%)
 rename {test => app}/test/test_pdump.c (100%)
 rename {test => app}/test/test_pdump.h (100%)
 rename {test => app}/test/test_per_lcore.c (100%)
 rename {test => app}/test/test_pmd_perf.c (100%)
 rename {test => app}/test/test_pmd_ring.c (100%)
 rename {test => app}/test/test_pmd_ring_perf.c (100%)
 rename {test => app}/test/test_power.c (100%)
 rename {test => app}/test/test_power_acpi_cpufreq.c (100%)
 rename {test => app}/test/test_power_kvm_vm.c (100%)
 rename {test => app}/test/test_prefetch.c (100%)
 rename {test => app}/test/test_rawdev.c (100%)
 rename {test => app}/test/test_reciprocal_division.c (100%)
 rename {test => app}/test/test_reciprocal_division_perf.c (100%)
 rename {test => app}/test/test_red.c (100%)
 rename {test => app}/test/test_reorder.c (100%)
 rename {test => app}/test/test_resource.c (100%)
 rename {test => app}/test/test_ring.c (100%)
 rename {test => app}/test/test_ring_perf.c (100%)
 rename {test => app}/test/test_rwlock.c (100%)
 rename {test => app}/test/test_sched.c (100%)
 rename {test => app}/test/test_service_cores.c (100%)
 rename {test => app}/test/test_spinlock.c (100%)
 rename {test => app}/test/test_string_fns.c (100%)
 rename {test => app}/test/test_table.c (100%)
 rename {test => app}/test/test_table.h (100%)
 rename {test => app}/test/test_table_acl.c (100%)
 rename {test => app}/test/test_table_acl.h (100%)
 rename {test => app}/test/test_table_combined.c (100%)
 rename {test => app}/test/test_table_combined.h (100%)
 rename {test => app}/test/test_table_pipeline.c (100%)
 rename {test => app}/test/test_table_pipeline.h (100%)
 rename {test => app}/test/test_table_ports.c (100%)
 rename {test => app}/test/test_table_ports.h (100%)
 rename {test => app}/test/test_table_tables.c (100%)
 rename {test => app}/test/test_table_tables.h (100%)
 rename {test => app}/test/test_tailq.c (100%)
 rename {test => app}/test/test_thash.c (100%)
 rename {test => app}/test/test_timer.c (100%)
 rename {test => app}/test/test_timer_perf.c (100%)
 rename {test => app}/test/test_timer_racecond.c (100%)
 rename {test => app}/test/test_version.c (100%)
 rename {test => app}/test/test_xmmt_ops.h (100%)
 rename {test => app}/test/virtual_pmd.c (100%)
 rename {test => app}/test/virtual_pmd.h (100%)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
 delete mode 100644 test/Makefile
 delete mode 100644 test/meson.build
Signature · 1 line
2.20.1
#9 lore raw

PATCH v2 1/5 test/cmdline_test: move to app directory

Move app to "app" directory and enable with meson build.

---
 MAINTAINERS                                     | 2 +-
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0
 app/cmdline_test/meson.build                    | 5 +++++
 app/meson.build                                 | 3 ++-
 test/Makefile                                   | 1 -
 11 files changed, 9 insertions(+), 3 deletions(-)
 rename {test => app}/cmdline_test/Makefile (100%)
 rename {test => app}/cmdline_test/cmdline_test.c (100%)
 rename {test => app}/cmdline_test/cmdline_test.h (100%)
 rename {test => app}/cmdline_test/cmdline_test.py (100%)
 rename {test => app}/cmdline_test/cmdline_test_data.py (100%)
 rename {test => app}/cmdline_test/commands.c (100%)
 create mode 100644 app/cmdline_test/meson.build
MAINTAINERS +1 -1
index eef480ab5..1a381f9bc 100644
@@ -1168,7 +1168,7 @@ F: test/test/test_cfgfiles/
 Interactive command line
 M: Olivier Matz <[email protected]>
 F: lib/librte_cmdline/
-F: test/cmdline_test/
+F: app/cmdline_test/
 F: test/test/test_cmdline*
 F: examples/cmdline/
 F: doc/guides/sample_app_ug/cmd_line.rst
app/Makefile +1 -0
index d6641ef1c..3515097d9 100644
@@ -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_CMDLINE) += cmdline_test
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
app/cmdline_test/Makefile renamed from test/cmdline_test/Makefile +0 -0
similarity index 100%
rename from test/cmdline_test/Makefile
rename to app/cmdline_test/Makefile
app/cmdline_test/cmdline_test.c renamed from test/cmdline_test/cmdline_test.c +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.c
rename to app/cmdline_test/cmdline_test.c
app/cmdline_test/cmdline_test.h renamed from test/cmdline_test/cmdline_test.h +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.h
rename to app/cmdline_test/cmdline_test.h
app/cmdline_test/cmdline_test.py renamed from test/cmdline_test/cmdline_test.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.py
rename to app/cmdline_test/cmdline_test.py
app/cmdline_test/cmdline_test_data.py renamed from test/cmdline_test/cmdline_test_data.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test_data.py
rename to app/cmdline_test/cmdline_test_data.py
app/cmdline_test/commands.c renamed from test/cmdline_test/commands.c +0 -0
similarity index 100%
rename from test/cmdline_test/commands.c
rename to app/cmdline_test/commands.c
app/cmdline_test/meson.build new file +5 -0
new file mode 100644
index 000000000..9d0a9aeb6
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('commands.c', 'cmdline_test.c')
+deps += 'cmdline'
app/meson.build +2 -1
index 47a2a8615..9fc9b4fdc 100644
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-apps = ['pdump',
+apps = ['cmdline_test',
+	'pdump',
 	'proc-info',
 	'test-bbdev',
 	'test-compress-perf',
test/Makefile +0 -1
index 6656374fc..4ffc087a0 100644
@@ -6,6 +6,5 @@ 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
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test
 
 include $(RTE_SDK)/mk/rte.subdir.mk
Signature · 1 line
2.20.1
#10 lore raw

Re: [PATCH v2 1/5] test/cmdline_test: move to app directory

19/02/2019 15:53, Bruce Richardson:

Quoted 4 lines

Move app to "app" directory and enable with meson build.

Quoted 9 lines
---
 MAINTAINERS                                     | 2 +-
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0

Sorry, I didn't realize before,
other test apps directories are named test-*.
Shouldn't we name this one test-cmdline?

#11 lore raw

Re: [PATCH v2 1/5] test/cmdline_test: move to app directory

Quoted 15 lines · Thomas Monjalon

19/02/2019 15:53, Bruce Richardson:

Quoted 4 lines

Move app to "app" directory and enable with meson build.

Quoted 9 lines
---
 MAINTAINERS                                     | 2 +-
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0
Quoted 4 lines

Sorry, I didn't realize before,
other test apps directories are named test-*.
Shouldn't we name this one test-cmdline?

Probably not a bad idea.

#12 lore raw

Re: [PATCH v2 1/5] test/cmdline_test: move to app directory

In reply to Thomas Monjalon
Quoted 15 lines · Thomas Monjalon

19/02/2019 15:53, Bruce Richardson:

Quoted 4 lines

Move app to "app" directory and enable with meson build.

Quoted 9 lines
---
 MAINTAINERS                                     | 2 +-
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0
Quoted 4 lines

Sorry, I didn't realize before,
other test apps directories are named test-*.
Shouldn't we name this one test-cmdline?

Looking into it now, changing the directory name is easy enough, however the final binary produced is also called cmdline_test - should it be changed too? Changing it would be a bit more invasive, and would be user-visible (perhaps just to test suites), but would lead to more consistency.

NOTE: this only applies to the "make" build, since the meson build uses the directory name as the binary name, so it's already consistent. There is no user visible change here, since the app wasn't available from meson builds before.

My recommendation is therefore to rename the directory only, and leave the binary name the same for make builds, given that when we switch completely over to meson it will be consistent at that point.

Thoughts, Thomas?

/Bruce

#13 lore raw

Re: [PATCH v2 1/5] test/cmdline_test: move to app directory

Quoted 26 lines · Bruce Richardson
Quoted 15 lines · Thomas Monjalon

19/02/2019 15:53, Bruce Richardson:

Quoted 4 lines

Move app to "app" directory and enable with meson build.

Quoted 9 lines
---
 MAINTAINERS                                     | 2 +-
 app/Makefile                                    | 1 +
 {test => app}/cmdline_test/Makefile             | 0
 {test => app}/cmdline_test/cmdline_test.c       | 0
 {test => app}/cmdline_test/cmdline_test.h       | 0
 {test => app}/cmdline_test/cmdline_test.py      | 0
 {test => app}/cmdline_test/cmdline_test_data.py | 0
 {test => app}/cmdline_test/commands.c           | 0
Quoted 4 lines

Sorry, I didn't realize before,
other test apps directories are named test-*.
Shouldn't we name this one test-cmdline?

Looking into it now, changing the directory name is easy enough, however the final binary produced is also called cmdline_test - should it be changed too? Changing it would be a bit more invasive, and would be user-visible (perhaps just to test suites), but would lead to more consistency.

Quoted 9 lines

NOTE: this only applies to the "make" build, since the meson build uses the directory name as the binary name, so it's already consistent. There is no user visible change here, since the app wasn't available from meson builds before.

My recommendation is therefore to rename the directory only, and leave the binary name the same for make builds, given that when we switch completely over to meson it will be consistent at that point.

Implemented in V3 patchset.

#14 lore raw

PATCH v2 2/5 test/test-acl: move to app directory

In reply to Bruce Richardson

Move to "app" directory and enable with meson build.

CC Konstantin Ananyev <[email protected]>
---
 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
MAINTAINERS +1 -1
index 1a381f9bc..70a7a1371 100644
@@ -1107,7 +1107,7 @@ ACL
 M: Konstantin Ananyev <[email protected]>
 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
app/Makefile +1 -0
index 3515097d9..7f397f3d5 100644
@@ -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
app/meson.build +1 -0
index 9fc9b4fdc..5865d5e01 100644
@@ -4,6 +4,7 @@
 apps = ['cmdline_test',
 	'pdump',
 	'proc-info',
+	'test-acl',
 	'test-bbdev',
 	'test-compress-perf',
 	'test-crypto-perf',
app/test-acl/Makefile renamed from test/test-acl/Makefile +0 -0
similarity index 100%
rename from test/test-acl/Makefile
rename to app/test-acl/Makefile
app/test-acl/main.c renamed from test/test-acl/main.c +0 -0
similarity index 100%
rename from test/test-acl/main.c
rename to app/test-acl/main.c
app/test-acl/meson.build new file +5 -0
new file mode 100644
index 000000000..d5c2581b4
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('main.c')
+deps += ['acl', 'net']
test/Makefile +0 -1
index 4ffc087a0..0b7a3ed96 100644
@@ -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
Signature · 1 line
2.20.1
#15 lore raw

PATCH v2 3/5 test/test-pipeline: move to app directory

In reply to Bruce Richardson

Move to the app directory, and add to meson build.

CC Cristian Dumitrescu <[email protected]>
---
 MAINTAINERS                                     |  2 +-
 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
 doc/guides/sample_app_ug/test_pipeline.rst      |  2 +-
 test/Makefile                                   |  1 -
 17 files changed, 18 insertions(+), 3 deletions(-)
 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%)
MAINTAINERS +1 -1
index 70a7a1371..c4619174a 100644
@@ -1094,7 +1094,7 @@ F: lib/librte_port/
 F: lib/librte_table/
 F: doc/guides/prog_guide/packet_framework.rst
 F: test/test/test_table*
-F: test/test-pipeline/
+F: app/test-pipeline/
 F: doc/guides/sample_app_ug/test_pipeline.rst
 F: examples/ip_pipeline/
 F: doc/guides/sample_app_ug/ip_pipeline.rst
app/Makefile +1 -0
index 7f397f3d5..2940ac38f 100644
@@ -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
app/meson.build +1 -0
index 5865d5e01..6053af7c1 100644
@@ -9,6 +9,7 @@ apps = ['cmdline_test',
 	'test-compress-perf',
 	'test-crypto-perf',
 	'test-eventdev',
+	'test-pipeline',
 	'test-pmd']
 
 # for BSD only
app/test-pipeline/Makefile renamed from test/test-pipeline/Makefile +0 -0
similarity index 100%
rename from test/test-pipeline/Makefile
rename to app/test-pipeline/Makefile
app/test-pipeline/config.c renamed from test/test-pipeline/config.c +0 -0
similarity index 100%
rename from test/test-pipeline/config.c
rename to app/test-pipeline/config.c
app/test-pipeline/init.c renamed from test/test-pipeline/init.c +0 -0
similarity index 100%
rename from test/test-pipeline/init.c
rename to app/test-pipeline/init.c
app/test-pipeline/main.c renamed from test/test-pipeline/main.c +0 -0
similarity index 100%
rename from test/test-pipeline/main.c
rename to app/test-pipeline/main.c
app/test-pipeline/main.h renamed from test/test-pipeline/main.h +0 -0
similarity index 100%
rename from test/test-pipeline/main.h
rename to app/test-pipeline/main.h
app/test-pipeline/meson.build new file +14 -0
new file mode 100644
index 000000000..5578b414d
@@ -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'
app/test-pipeline/pipeline_acl.c renamed from test/test-pipeline/pipeline_acl.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_acl.c
rename to app/test-pipeline/pipeline_acl.c
app/test-pipeline/pipeline_hash.c renamed from test/test-pipeline/pipeline_hash.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_hash.c
rename to app/test-pipeline/pipeline_hash.c
app/test-pipeline/pipeline_lpm.c renamed from test/test-pipeline/pipeline_lpm.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm.c
rename to app/test-pipeline/pipeline_lpm.c
app/test-pipeline/pipeline_lpm_ipv6.c renamed from test/test-pipeline/pipeline_lpm_ipv6.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm_ipv6.c
rename to app/test-pipeline/pipeline_lpm_ipv6.c
app/test-pipeline/pipeline_stub.c renamed from test/test-pipeline/pipeline_stub.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_stub.c
rename to app/test-pipeline/pipeline_stub.c
app/test-pipeline/runtime.c renamed from test/test-pipeline/runtime.c +0 -0
similarity index 100%
rename from test/test-pipeline/runtime.c
rename to app/test-pipeline/runtime.c
doc/guides/sample_app_ug/test_pipeline.rst +1 -1
index a9370c80b..5f313c529 100644
@@ -32,7 +32,7 @@ Compiling the Application
 -------------------------
 To compile the sample application see :doc:`compiling`
 
-The application is located in the ``$RTE_SDK/test/test-pipline`` directory.
+The application is located in the ``$RTE_SDK/app/test-pipline`` directory.
 
 
 Running the Application
test/Makefile +0 -1
index 0b7a3ed96..e9ae64b59 100644
@@ -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
Signature · 1 line
2.20.1
#16 lore raw

PATCH v2 4/5 test/bpf: move to examples folder

In reply to Bruce Richardson

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd. Therefore we can move it to the examples folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated.

CC Konstantin Ananyev <[email protected]>
---
 MAINTAINERS                                 | 2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
 examples/bpf/README                         | 8 ++++++++
 {test => examples}/bpf/dummy.c              | 0
 {test => examples}/bpf/mbuf.h               | 0
 examples/bpf/meson.build                    | 6 ++++++
 {test => examples}/bpf/t1.c                 | 0
 {test => examples}/bpf/t2.c                 | 0
 {test => examples}/bpf/t3.c                 | 0
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
MAINTAINERS +1 -1
index c4619174a..6d1d0aea7 100644
@@ -1230,7 +1230,7 @@ F: doc/guides/howto/telemetry.rst
 BPF - EXPERIMENTAL
 M: Konstantin Ananyev <[email protected]>
 F: lib/librte_bpf/
-F: test/bpf/
+F: examples/bpf/
 F: test/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -4
index 029148041..b079c60d9 100644
@@ -4503,20 +4503,20 @@ For example:
 
 .. code-block:: console
 
-   cd test/bpf
+   cd examples/bpf
    clang -O2 -target bpf -c t1.c
 
 Then to load (and JIT compile) t1.o at RX queue 0, port 1::
 
 .. code-block:: console
 
-   testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
 
 To load (not JITed) t1.o at TX queue 0, port 0::
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o
 
 bpf-unload
 ~~~~~~~~~~
@@ -4529,4 +4529,4 @@ For example to unload BPF filter from TX queue 0, port 0:
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-unload tx 0 0
examples/bpf/README new file +8 -0
new file mode 100644
index 000000000..d714180a5
@@ -0,0 +1,8 @@
+This folder contains example BPF programs for use with the DPDK bpf
+library. To get details of each program and how to compile it, see
+the header on the '.c' file itself.
+
+Once compiled, these example programs can be loaded into `testpmd`
+for execution on a packet stream. See `bpf-load` and `bpf-unload`
+commands documented in the `Testpmd Application User Guide` for
+details on how to do so.
examples/bpf/dummy.c renamed from test/bpf/dummy.c +0 -0
similarity index 100%
rename from test/bpf/dummy.c
rename to examples/bpf/dummy.c
examples/bpf/mbuf.h renamed from test/bpf/mbuf.h +0 -0
similarity index 100%
rename from test/bpf/mbuf.h
rename to examples/bpf/mbuf.h
examples/bpf/meson.build new file +6 -0
new file mode 100644
index 000000000..0a817aaea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+# This contains BPF example code for use in testing BPF with testpmd,
+# therefore it should not be built as part of a meson build.
+build=false
examples/bpf/t1.c renamed from test/bpf/t1.c +0 -0
similarity index 100%
rename from test/bpf/t1.c
rename to examples/bpf/t1.c
examples/bpf/t2.c renamed from test/bpf/t2.c +0 -0
similarity index 100%
rename from test/bpf/t2.c
rename to examples/bpf/t2.c
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -0
similarity index 100%
rename from test/bpf/t3.c
rename to examples/bpf/t3.c
Signature · 1 line
2.20.1
#17 lore raw

Re: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 11 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, February 19, 2019 2:53 PM
To: [email protected]; [email protected]
Cc: Richardson, Bruce <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 4/5] test/bpf: move to examples folder

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd.

Might be the better to create app/test-pmf/bpf directory and move them into it.
Konstantin

Quoted 121 lines

Therefore we can
move it to the examples folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated.

CC Konstantin Ananyev <[email protected]>
---
 MAINTAINERS                                 | 2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
 examples/bpf/README                         | 8 ++++++++
 {test => examples}/bpf/dummy.c              | 0
 {test => examples}/bpf/mbuf.h               | 0
 examples/bpf/meson.build                    | 6 ++++++
 {test => examples}/bpf/t1.c                 | 0
 {test => examples}/bpf/t2.c                 | 0
 {test => examples}/bpf/t3.c                 | 0
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
MAINTAINERS +1 -1
index c4619174a..6d1d0aea7 100644
@@ -1230,7 +1230,7 @@ F: doc/guides/howto/telemetry.rst
 BPF - EXPERIMENTAL
 M: Konstantin Ananyev <[email protected]>
 F: lib/librte_bpf/
-F: test/bpf/
+F: examples/bpf/
 F: test/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -4
index 029148041..b079c60d9 100644
@@ -4503,20 +4503,20 @@ For example:
 
 .. code-block:: console
 
-   cd test/bpf
+   cd examples/bpf
    clang -O2 -target bpf -c t1.c
 
 Then to load (and JIT compile) t1.o at RX queue 0, port 1::
 
 .. code-block:: console
 
-   testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
 
 To load (not JITed) t1.o at TX queue 0, port 0::
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o
 
 bpf-unload
 ~~~~~~~~~~
@@ -4529,4 +4529,4 @@ For example to unload BPF filter from TX queue 0, port 0:
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-unload tx 0 0
examples/bpf/README new file +8 -0
new file mode 100644
index 000000000..d714180a5
@@ -0,0 +1,8 @@
+This folder contains example BPF programs for use with the DPDK bpf
+library. To get details of each program and how to compile it, see
+the header on the '.c' file itself.
+
+Once compiled, these example programs can be loaded into `testpmd`
+for execution on a packet stream. See `bpf-load` and `bpf-unload`
+commands documented in the `Testpmd Application User Guide` for
+details on how to do so.
examples/bpf/dummy.c renamed from test/bpf/dummy.c +0 -0
similarity index 100%
rename from test/bpf/dummy.c
rename to examples/bpf/dummy.c
examples/bpf/mbuf.h renamed from test/bpf/mbuf.h +0 -0
similarity index 100%
rename from test/bpf/mbuf.h
rename to examples/bpf/mbuf.h
examples/bpf/meson.build new file +6 -0
new file mode 100644
index 000000000..0a817aaea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+# This contains BPF example code for use in testing BPF with testpmd,
+# therefore it should not be built as part of a meson build.
+build=false
examples/bpf/t1.c renamed from test/bpf/t1.c +0 -0
similarity index 100%
rename from test/bpf/t1.c
rename to examples/bpf/t1.c
examples/bpf/t2.c renamed from test/bpf/t2.c +0 -0
similarity index 100%
rename from test/bpf/t2.c
rename to examples/bpf/t2.c
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -1
similarity index 100%
rename from test/bpf/t3.c
rename to examples/bpf/t3.c
--

2.20.1

#18 lore raw

Re: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 9 lines · Konstantin
Quoted 9 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, February 19, 2019 2:53 PM
To: [email protected]; [email protected]
Cc: Richardson, Bruce <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 7 lines
Quoted 2 lines

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd.

Might be the better to create app/test-pmf/bpf directory and move them into it.
Konstantin

Assume "test-pmd" in the path, right? I actually think they are better in examples, myself, but no strong opinions. Anyone else have thoughts? [Thomas, you are generally a good man for having your say - any input here?]

/Bruce

#19 lore raw

Re: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 19 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Wednesday, February 20, 2019 9:40 AM
To: Ananyev, Konstantin <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 9 lines · Konstantin
Quoted 9 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, February 19, 2019 2:53 PM
To: [email protected]; [email protected]
Cc: Richardson, Bruce <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 4/5] test/bpf: move to examples folder

Quoted 8 lines
Quoted 7 lines
Quoted 2 lines

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd.

Might be the better to create app/test-pmf/bpf directory and move them into it.
Konstantin

Assume "test-pmd" in the path, right?

Yes :)

Quoted 6 lines

I actually think they are better in
examples, myself, but no strong opinions. Anyone else have thoughts? [Thomas, you are generally a good man for having your say - any input here?]

/Bruce

#20 lore raw

Re: [PATCH v2 4/5] test/bpf: move to examples folder

In reply to Bruce Richardson

20/02/2019 10:39, Bruce Richardson:

Quoted 6 lines · Konstantin
Quoted 5 lines

From: Richardson, Bruce

Quoted 3 lines

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd.

Quoted 8 lines
Quoted 4 lines

Might be the better to create app/test-pmf/bpf directory and move them into it.
Konstantin

Assume "test-pmd" in the path, right? I actually think they are better in examples, myself, but no strong opinions. Anyone else have thoughts? [Thomas, you are generally a good man for having your say - any input here?]

Those BPF programs can be used by any app having BPF loading support, right? So I think the examples/ directory is the right place.

Acked-by on v2 4/5
#21 lore raw

Re: [PATCH v2 4/5] test/bpf: move to examples folder

In reply to Bruce Richardson
Quoted 129 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, February 19, 2019 2:53 PM
To: [email protected]; [email protected]
Cc: Richardson, Bruce <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 4/5] test/bpf: move to examples folder

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd. Therefore we can move it to the examples folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated.

CC Konstantin Ananyev <[email protected]>
---
 MAINTAINERS                                 | 2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
 examples/bpf/README                         | 8 ++++++++
 {test => examples}/bpf/dummy.c              | 0
 {test => examples}/bpf/mbuf.h               | 0
 examples/bpf/meson.build                    | 6 ++++++
 {test => examples}/bpf/t1.c                 | 0
 {test => examples}/bpf/t2.c                 | 0
 {test => examples}/bpf/t3.c                 | 0
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
MAINTAINERS +1 -1
index c4619174a..6d1d0aea7 100644
@@ -1230,7 +1230,7 @@ F: doc/guides/howto/telemetry.rst
 BPF - EXPERIMENTAL
 M: Konstantin Ananyev <[email protected]>
 F: lib/librte_bpf/
-F: test/bpf/
+F: examples/bpf/
 F: test/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -4
index 029148041..b079c60d9 100644
@@ -4503,20 +4503,20 @@ For example:
 
 .. code-block:: console
 
-   cd test/bpf
+   cd examples/bpf
    clang -O2 -target bpf -c t1.c
 
 Then to load (and JIT compile) t1.o at RX queue 0, port 1::
 
 .. code-block:: console
 
-   testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
 
 To load (not JITed) t1.o at TX queue 0, port 0::
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o
 
 bpf-unload
 ~~~~~~~~~~
@@ -4529,4 +4529,4 @@ For example to unload BPF filter from TX queue 0, port 0:
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-unload tx 0 0
examples/bpf/README new file +8 -0
new file mode 100644
index 000000000..d714180a5
@@ -0,0 +1,8 @@
+This folder contains example BPF programs for use with the DPDK bpf
+library. To get details of each program and how to compile it, see
+the header on the '.c' file itself.
+
+Once compiled, these example programs can be loaded into `testpmd`
+for execution on a packet stream. See `bpf-load` and `bpf-unload`
+commands documented in the `Testpmd Application User Guide` for
+details on how to do so.
examples/bpf/dummy.c renamed from test/bpf/dummy.c +0 -0
similarity index 100%
rename from test/bpf/dummy.c
rename to examples/bpf/dummy.c
examples/bpf/mbuf.h renamed from test/bpf/mbuf.h +0 -0
similarity index 100%
rename from test/bpf/mbuf.h
rename to examples/bpf/mbuf.h
examples/bpf/meson.build new file +6 -0
new file mode 100644
index 000000000..0a817aaea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+# This contains BPF example code for use in testing BPF with testpmd,
+# therefore it should not be built as part of a meson build.
+build=false
examples/bpf/t1.c renamed from test/bpf/t1.c +0 -0
similarity index 100%
rename from test/bpf/t1.c
rename to examples/bpf/t1.c
examples/bpf/t2.c renamed from test/bpf/t2.c +0 -0
similarity index 100%
rename from test/bpf/t2.c
rename to examples/bpf/t2.c
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -0
similarity index 100%
rename from test/bpf/t3.c
rename to examples/bpf/t3.c

examples/bpf/t3.c

Quoted 1 line
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -1
--
Quoted 1 line

2.20.1

#22 lore raw

PATCH v2 5/5 test/test: move to app folder

In reply to Bruce Richardson

Since all other apps have been moved to the "app" folder, the autotest app remains alone in the test folder. Rather than having an entire top-level folder for this, we can move it back to where it all started in early versions of DPDK - the "app/" folder.

This move has a couple of advantages:
* This reduces clutter at the top level of the project, due to one less folder.
* It eliminates the separate build task necessary for building the autotests using make "make test-build" which means that developers are less likely to miss something in their own compilation tests
* It re-aligns the final location of the test binary in the app folder when building with make with it's location in the source tree.

For meson builds, the autotest app is different from the other apps in that it needs a series of different test cases defined for it for use by "meson test". Therefore, it does not get built as part of the main loop in the app folder, but gets built separately at the end.

---
 GNUmakefile                                   |   1 -
 MAINTAINERS                                   | 182 +++++++++---------
 app/Makefile                                  |   1 +
 app/meson.build                               |   3 +
 {test => app}/test/Makefile                   |   0
 {test => app}/test/autotest.py                |   0
 {test => app}/test/autotest_data.py           |   0
 {test => app}/test/autotest_runner.py         |   0
 {test => app}/test/autotest_test_funcs.py     |   0
 {test => app}/test/commands.c                 |   0
 {test => app}/test/meson.build                |   0
 {test => app}/test/packet_burst_generator.c   |   0
 {test => app}/test/packet_burst_generator.h   |   0
 {test => app}/test/process.h                  |   0
 {test => app}/test/resource.c                 |   0
 {test => app}/test/resource.h                 |   0
 {test => app}/test/sample_packet_forward.c    |   0
 {test => app}/test/sample_packet_forward.h    |   0
 {test => app}/test/test.c                     |   0
 {test => app}/test/test.h                     |   0
 {test => app}/test/test_acl.c                 |   0
 {test => app}/test/test_acl.h                 |   0
 {test => app}/test/test_alarm.c               |   0
 {test => app}/test/test_atomic.c              |   0
 {test => app}/test/test_barrier.c             |   0
 {test => app}/test/test_bitmap.c              |   0
 {test => app}/test/test_bitratestats.c        |   0
 {test => app}/test/test_bpf.c                 |   0
 {test => app}/test/test_byteorder.c           |   0
 {test => app}/test/test_cfgfile.c             |   0
 .../test/test_cfgfiles/etc/empty.ini          |   0
 .../test_cfgfiles/etc/empty_key_value.ini     |   0
 .../test_cfgfiles/etc/invalid_section.ini     |   0
 .../test/test_cfgfiles/etc/line_too_long.ini  |   0
 .../test_cfgfiles/etc/missing_section.ini     |   0
 .../test_cfgfiles/etc/realloc_sections.ini    |   0
 .../test/test_cfgfiles/etc/sample1.ini        |   0
 .../test/test_cfgfiles/etc/sample2.ini        |   0
 {test => app}/test/test_cmdline.c             |   0
 {test => app}/test/test_cmdline.h             |   0
 {test => app}/test/test_cmdline_cirbuf.c      |   0
 {test => app}/test/test_cmdline_etheraddr.c   |   0
 {test => app}/test/test_cmdline_ipaddr.c      |   0
 {test => app}/test/test_cmdline_lib.c         |   0
 {test => app}/test/test_cmdline_num.c         |   0
 {test => app}/test/test_cmdline_portlist.c    |   0
 {test => app}/test/test_cmdline_string.c      |   0
 {test => app}/test/test_common.c              |   0
 {test => app}/test/test_compressdev.c         |   0
 .../test/test_compressdev_test_buffer.h       |   0
 {test => app}/test/test_cpuflags.c            |   0
 {test => app}/test/test_crc.c                 |   0
 {test => app}/test/test_cryptodev.c           |   0
 {test => app}/test/test_cryptodev.h           |   0
 .../test/test_cryptodev_aead_test_vectors.h   |   0
 .../test/test_cryptodev_aes_test_vectors.h    |   0
 {test => app}/test/test_cryptodev_asym.c      |   0
 {test => app}/test/test_cryptodev_asym_util.h |   0
 .../test/test_cryptodev_blockcipher.c         |   0
 .../test/test_cryptodev_blockcipher.h         |   0
 .../test/test_cryptodev_des_test_vectors.h    |   0
 .../test/test_cryptodev_dh_test_vectors.h     |   0
 .../test/test_cryptodev_dsa_test_vectors.h    |   0
 .../test/test_cryptodev_hash_test_vectors.h   |   0
 .../test/test_cryptodev_hmac_test_vectors.h   |   0
 .../test_cryptodev_kasumi_hash_test_vectors.h |   0
 .../test/test_cryptodev_kasumi_test_vectors.h |   0
 .../test/test_cryptodev_mod_test_vectors.h    |   0
 .../test/test_cryptodev_rsa_test_vectors.h    |   0
 .../test_cryptodev_snow3g_hash_test_vectors.h |   0
 .../test/test_cryptodev_snow3g_test_vectors.h |   0
 .../test/test_cryptodev_zuc_test_vectors.h    |   0
 {test => app}/test/test_cycles.c              |   0
 {test => app}/test/test_debug.c               |   0
 {test => app}/test/test_distributor.c         |   0
 {test => app}/test/test_distributor_perf.c    |   0
 {test => app}/test/test_eal_flags.c           |   0
 {test => app}/test/test_eal_fs.c              |   0
 {test => app}/test/test_efd.c                 |   0
 {test => app}/test/test_efd_perf.c            |   0
 {test => app}/test/test_errno.c               |   0
 .../test/test_event_crypto_adapter.c          |   0
 .../test/test_event_eth_rx_adapter.c          |   0
 .../test/test_event_eth_tx_adapter.c          |   0
 {test => app}/test/test_event_ring.c          |   0
 {test => app}/test/test_event_timer_adapter.c |   0
 {test => app}/test/test_eventdev.c            |   0
 {test => app}/test/test_external_mem.c        |   0
 {test => app}/test/test_fbarray.c             |   0
 {test => app}/test/test_flow_classify.c       |   0
 {test => app}/test/test_flow_classify.h       |   0
 {test => app}/test/test_func_reentrancy.c     |   0
 {test => app}/test/test_hash.c                |   0
 {test => app}/test/test_hash_functions.c      |   0
 {test => app}/test/test_hash_multiwriter.c    |   0
 {test => app}/test/test_hash_perf.c           |   0
 {test => app}/test/test_hash_readwrite.c      |   0
 {test => app}/test/test_hash_readwrite_lf.c   |   0
 {test => app}/test/test_interrupts.c          |   0
 {test => app}/test/test_ipsec.c               |   0
 {test => app}/test/test_kni.c                 |   0
 {test => app}/test/test_kvargs.c              |   0
 {test => app}/test/test_latencystats.c        |   0
 {test => app}/test/test_link_bonding.c        |   0
 {test => app}/test/test_link_bonding_mode4.c  |   0
 .../test/test_link_bonding_rssconf.c          |   0
 {test => app}/test/test_logs.c                |   0
 {test => app}/test/test_lpm.c                 |   0
 {test => app}/test/test_lpm6.c                |   0
 {test => app}/test/test_lpm6_data.h           |   0
 {test => app}/test/test_lpm6_perf.c           |   0
 {test => app}/test/test_lpm_perf.c            |   0
 {test => app}/test/test_malloc.c              |   0
 {test => app}/test/test_mbuf.c                |   0
 {test => app}/test/test_member.c              |   0
 {test => app}/test/test_member_perf.c         |   0
 {test => app}/test/test_memcpy.c              |   0
 {test => app}/test/test_memcpy_perf.c         |   0
 {test => app}/test/test_memory.c              |   0
 {test => app}/test/test_mempool.c             |   0
 {test => app}/test/test_mempool_perf.c        |   0
 {test => app}/test/test_memzone.c             |   0
 {test => app}/test/test_meter.c               |   0
 {test => app}/test/test_metrics.c             |   0
 {test => app}/test/test_mp_secondary.c        |   0
 {test => app}/test/test_pdump.c               |   0
 {test => app}/test/test_pdump.h               |   0
 {test => app}/test/test_per_lcore.c           |   0
 {test => app}/test/test_pmd_perf.c            |   0
 {test => app}/test/test_pmd_ring.c            |   0
 {test => app}/test/test_pmd_ring_perf.c       |   0
 {test => app}/test/test_power.c               |   0
 {test => app}/test/test_power_acpi_cpufreq.c  |   0
 {test => app}/test/test_power_kvm_vm.c        |   0
 {test => app}/test/test_prefetch.c            |   0
 {test => app}/test/test_rawdev.c              |   0
 {test => app}/test/test_reciprocal_division.c |   0
 .../test/test_reciprocal_division_perf.c      |   0
 {test => app}/test/test_red.c                 |   0
 {test => app}/test/test_reorder.c             |   0
 {test => app}/test/test_resource.c            |   0
 {test => app}/test/test_ring.c                |   0
 {test => app}/test/test_ring_perf.c           |   0
 {test => app}/test/test_rwlock.c              |   0
 {test => app}/test/test_sched.c               |   0
 {test => app}/test/test_service_cores.c       |   0
 {test => app}/test/test_spinlock.c            |   0
 {test => app}/test/test_string_fns.c          |   0
 {test => app}/test/test_table.c               |   0
 {test => app}/test/test_table.h               |   0
 {test => app}/test/test_table_acl.c           |   0
 {test => app}/test/test_table_acl.h           |   0
 {test => app}/test/test_table_combined.c      |   0
 {test => app}/test/test_table_combined.h      |   0
 {test => app}/test/test_table_pipeline.c      |   0
 {test => app}/test/test_table_pipeline.h      |   0
 {test => app}/test/test_table_ports.c         |   0
 {test => app}/test/test_table_ports.h         |   0
 {test => app}/test/test_table_tables.c        |   0
 {test => app}/test/test_table_tables.h        |   0
 {test => app}/test/test_tailq.c               |   0
 {test => app}/test/test_thash.c               |   0
 {test => app}/test/test_timer.c               |   0
 {test => app}/test/test_timer_perf.c          |   0
 {test => app}/test/test_timer_racecond.c      |   0
 {test => app}/test/test_version.c             |   0
 {test => app}/test/test_xmmt_ops.h            |   0
 {test => app}/test/virtual_pmd.c              |   0
 {test => app}/test/virtual_pmd.h              |   0
 devtools/test-build.sh                        |   3 -
 doc/guides/compressdevs/octeontx.rst          |   2 +-
 doc/guides/cryptodevs/qat.rst                 |   4 +-
 doc/guides/cryptodevs/virtio.rst              |   2 +-
 doc/guides/mempool/octeontx.rst               |   2 +-
 doc/guides/prog_guide/compressdev.rst         |   2 +-
 meson.build                                   |   1 -
 mk/rte.sdkbuild.mk                            |   3 -
 mk/rte.sdkroot.mk                             |   6 +-
 mk/rte.sdktest.mk                             |   8 +-
 test/Makefile                                 |   8 -
 test/meson.build                              |   4 -
 181 files changed, 107 insertions(+), 125 deletions(-)
 rename {test => app}/test/Makefile (100%)
 rename {test => app}/test/autotest.py (100%)
 rename {test => app}/test/autotest_data.py (100%)
 rename {test => app}/test/autotest_runner.py (100%)
 rename {test => app}/test/autotest_test_funcs.py (100%)
 rename {test => app}/test/commands.c (100%)
 rename {test => app}/test/meson.build (100%)
 rename {test => app}/test/packet_burst_generator.c (100%)
 rename {test => app}/test/packet_burst_generator.h (100%)
 rename {test => app}/test/process.h (100%)
 rename {test => app}/test/resource.c (100%)
 rename {test => app}/test/resource.h (100%)
 rename {test => app}/test/sample_packet_forward.c (100%)
 rename {test => app}/test/sample_packet_forward.h (100%)
 rename {test => app}/test/test.c (100%)
 rename {test => app}/test/test.h (100%)
 rename {test => app}/test/test_acl.c (100%)
 rename {test => app}/test/test_acl.h (100%)
 rename {test => app}/test/test_alarm.c (100%)
 rename {test => app}/test/test_atomic.c (100%)
 rename {test => app}/test/test_barrier.c (100%)
 rename {test => app}/test/test_bitmap.c (100%)
 rename {test => app}/test/test_bitratestats.c (100%)
 rename {test => app}/test/test_bpf.c (100%)
 rename {test => app}/test/test_byteorder.c (100%)
 rename {test => app}/test/test_cfgfile.c (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty_key_value.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/invalid_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/line_too_long.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/missing_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/realloc_sections.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample1.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample2.ini (100%)
 rename {test => app}/test/test_cmdline.c (100%)
 rename {test => app}/test/test_cmdline.h (100%)
 rename {test => app}/test/test_cmdline_cirbuf.c (100%)
 rename {test => app}/test/test_cmdline_etheraddr.c (100%)
 rename {test => app}/test/test_cmdline_ipaddr.c (100%)
 rename {test => app}/test/test_cmdline_lib.c (100%)
 rename {test => app}/test/test_cmdline_num.c (100%)
 rename {test => app}/test/test_cmdline_portlist.c (100%)
 rename {test => app}/test/test_cmdline_string.c (100%)
 rename {test => app}/test/test_common.c (100%)
 rename {test => app}/test/test_compressdev.c (100%)
 rename {test => app}/test/test_compressdev_test_buffer.h (100%)
 rename {test => app}/test/test_cpuflags.c (100%)
 rename {test => app}/test/test_crc.c (100%)
 rename {test => app}/test/test_cryptodev.c (100%)
 rename {test => app}/test/test_cryptodev.h (100%)
 rename {test => app}/test/test_cryptodev_aead_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_aes_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_asym.c (100%)
 rename {test => app}/test/test_cryptodev_asym_util.h (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.c (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.h (100%)
 rename {test => app}/test/test_cryptodev_des_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dh_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hmac_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_mod_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_rsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_zuc_test_vectors.h (100%)
 rename {test => app}/test/test_cycles.c (100%)
 rename {test => app}/test/test_debug.c (100%)
 rename {test => app}/test/test_distributor.c (100%)
 rename {test => app}/test/test_distributor_perf.c (100%)
 rename {test => app}/test/test_eal_flags.c (100%)
 rename {test => app}/test/test_eal_fs.c (100%)
 rename {test => app}/test/test_efd.c (100%)
 rename {test => app}/test/test_efd_perf.c (100%)
 rename {test => app}/test/test_errno.c (100%)
 rename {test => app}/test/test_event_crypto_adapter.c (100%)
 rename {test => app}/test/test_event_eth_rx_adapter.c (100%)
 rename {test => app}/test/test_event_eth_tx_adapter.c (100%)
 rename {test => app}/test/test_event_ring.c (100%)
 rename {test => app}/test/test_event_timer_adapter.c (100%)
 rename {test => app}/test/test_eventdev.c (100%)
 rename {test => app}/test/test_external_mem.c (100%)
 rename {test => app}/test/test_fbarray.c (100%)
 rename {test => app}/test/test_flow_classify.c (100%)
 rename {test => app}/test/test_flow_classify.h (100%)
 rename {test => app}/test/test_func_reentrancy.c (100%)
 rename {test => app}/test/test_hash.c (100%)
 rename {test => app}/test/test_hash_functions.c (100%)
 rename {test => app}/test/test_hash_multiwriter.c (100%)
 rename {test => app}/test/test_hash_perf.c (100%)
 rename {test => app}/test/test_hash_readwrite.c (100%)
 rename {test => app}/test/test_hash_readwrite_lf.c (100%)
 rename {test => app}/test/test_interrupts.c (100%)
 rename {test => app}/test/test_ipsec.c (100%)
 rename {test => app}/test/test_kni.c (100%)
 rename {test => app}/test/test_kvargs.c (100%)
 rename {test => app}/test/test_latencystats.c (100%)
 rename {test => app}/test/test_link_bonding.c (100%)
 rename {test => app}/test/test_link_bonding_mode4.c (100%)
 rename {test => app}/test/test_link_bonding_rssconf.c (100%)
 rename {test => app}/test/test_logs.c (100%)
 rename {test => app}/test/test_lpm.c (100%)
 rename {test => app}/test/test_lpm6.c (100%)
 rename {test => app}/test/test_lpm6_data.h (100%)
 rename {test => app}/test/test_lpm6_perf.c (100%)
 rename {test => app}/test/test_lpm_perf.c (100%)
 rename {test => app}/test/test_malloc.c (100%)
 rename {test => app}/test/test_mbuf.c (100%)
 rename {test => app}/test/test_member.c (100%)
 rename {test => app}/test/test_member_perf.c (100%)
 rename {test => app}/test/test_memcpy.c (100%)
 rename {test => app}/test/test_memcpy_perf.c (100%)
 rename {test => app}/test/test_memory.c (100%)
 rename {test => app}/test/test_mempool.c (100%)
 rename {test => app}/test/test_mempool_perf.c (100%)
 rename {test => app}/test/test_memzone.c (100%)
 rename {test => app}/test/test_meter.c (100%)
 rename {test => app}/test/test_metrics.c (100%)
 rename {test => app}/test/test_mp_secondary.c (100%)
 rename {test => app}/test/test_pdump.c (100%)
 rename {test => app}/test/test_pdump.h (100%)
 rename {test => app}/test/test_per_lcore.c (100%)
 rename {test => app}/test/test_pmd_perf.c (100%)
 rename {test => app}/test/test_pmd_ring.c (100%)
 rename {test => app}/test/test_pmd_ring_perf.c (100%)
 rename {test => app}/test/test_power.c (100%)
 rename {test => app}/test/test_power_acpi_cpufreq.c (100%)
 rename {test => app}/test/test_power_kvm_vm.c (100%)
 rename {test => app}/test/test_prefetch.c (100%)
 rename {test => app}/test/test_rawdev.c (100%)
 rename {test => app}/test/test_reciprocal_division.c (100%)
 rename {test => app}/test/test_reciprocal_division_perf.c (100%)
 rename {test => app}/test/test_red.c (100%)
 rename {test => app}/test/test_reorder.c (100%)
 rename {test => app}/test/test_resource.c (100%)
 rename {test => app}/test/test_ring.c (100%)
 rename {test => app}/test/test_ring_perf.c (100%)
 rename {test => app}/test/test_rwlock.c (100%)
 rename {test => app}/test/test_sched.c (100%)
 rename {test => app}/test/test_service_cores.c (100%)
 rename {test => app}/test/test_spinlock.c (100%)
 rename {test => app}/test/test_string_fns.c (100%)
 rename {test => app}/test/test_table.c (100%)
 rename {test => app}/test/test_table.h (100%)
 rename {test => app}/test/test_table_acl.c (100%)
 rename {test => app}/test/test_table_acl.h (100%)
 rename {test => app}/test/test_table_combined.c (100%)
 rename {test => app}/test/test_table_combined.h (100%)
 rename {test => app}/test/test_table_pipeline.c (100%)
 rename {test => app}/test/test_table_pipeline.h (100%)
 rename {test => app}/test/test_table_ports.c (100%)
 rename {test => app}/test/test_table_ports.h (100%)
 rename {test => app}/test/test_table_tables.c (100%)
 rename {test => app}/test/test_table_tables.h (100%)
 rename {test => app}/test/test_tailq.c (100%)
 rename {test => app}/test/test_thash.c (100%)
 rename {test => app}/test/test_timer.c (100%)
 rename {test => app}/test/test_timer_perf.c (100%)
 rename {test => app}/test/test_timer_racecond.c (100%)
 rename {test => app}/test/test_version.c (100%)
 rename {test => app}/test/test_xmmt_ops.h (100%)
 rename {test => app}/test/virtual_pmd.c (100%)
 rename {test => app}/test/virtual_pmd.h (100%)
 delete mode 100644 test/Makefile
 delete mode 100644 test/meson.build
GNUmakefile +0 -1
index ae80720e9..e8de422df 100644
@@ -13,6 +13,5 @@ export RTE_SDK
 #
 
 ROOTDIRS-y := buildtools lib kernel drivers app
-ROOTDIRS-  := test
 
 include $(RTE_SDK)/mk/rte.sdkroot.mk
MAINTAINERS +91 -91

437 lines not on this page · raw message

app/Makefile +1 -0
index 2940ac38f..f465b88cf 100644
@@ -3,6 +3,7 @@
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
+DIRS-$(CONFIG_RTE_APP_TEST) += test
 DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd
 DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info
 DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
app/meson.build +3 -0
index 6053af7c1..6fe6a2e3f 100644
@@ -64,3 +64,6 @@ foreach app:apps
 				install: true)
 	endif
 endforeach
+
+# special case the autotests
+subdir('test')
app/test/Makefile renamed from test/test/Makefile +0 -0
similarity index 100%
rename from test/test/Makefile
rename to app/test/Makefile
app/test/autotest.py renamed from test/test/autotest.py +0 -0
similarity index 100%
rename from test/test/autotest.py
rename to app/test/autotest.py
app/test/autotest_data.py renamed from test/test/autotest_data.py +0 -0
similarity index 100%
rename from test/test/autotest_data.py
rename to app/test/autotest_data.py
app/test/autotest_runner.py renamed from test/test/autotest_runner.py +0 -0
similarity index 100%
rename from test/test/autotest_runner.py
rename to app/test/autotest_runner.py
app/test/autotest_test_funcs.py renamed from test/test/autotest_test_funcs.py +0 -0
similarity index 100%
rename from test/test/autotest_test_funcs.py
rename to app/test/autotest_test_funcs.py
app/test/commands.c renamed from test/test/commands.c +0 -0
similarity index 100%
rename from test/test/commands.c
rename to app/test/commands.c
app/test/meson.build renamed from test/test/meson.build +0 -0
similarity index 100%
rename from test/test/meson.build
rename to app/test/meson.build
app/test/packet_burst_generator.c renamed from test/test/packet_burst_generator.c +0 -0
similarity index 100%
rename from test/test/packet_burst_generator.c
rename to app/test/packet_burst_generator.c
app/test/packet_burst_generator.h renamed from test/test/packet_burst_generator.h +0 -0
similarity index 100%
rename from test/test/packet_burst_generator.h
rename to app/test/packet_burst_generator.h
app/test/process.h renamed from test/test/process.h +0 -0
similarity index 100%
rename from test/test/process.h
rename to app/test/process.h
app/test/resource.c renamed from test/test/resource.c +0 -0
similarity index 100%
rename from test/test/resource.c
rename to app/test/resource.c
app/test/resource.h renamed from test/test/resource.h +0 -0
similarity index 100%
rename from test/test/resource.h
rename to app/test/resource.h
app/test/sample_packet_forward.c renamed from test/test/sample_packet_forward.c +0 -0
similarity index 100%
rename from test/test/sample_packet_forward.c
rename to app/test/sample_packet_forward.c
app/test/sample_packet_forward.h renamed from test/test/sample_packet_forward.h +0 -0
similarity index 100%
rename from test/test/sample_packet_forward.h
rename to app/test/sample_packet_forward.h
app/test/test.c renamed from test/test/test.c +0 -0
similarity index 100%
rename from test/test/test.c
rename to app/test/test.c
app/test/test.h renamed from test/test/test.h +0 -0
similarity index 100%
rename from test/test/test.h
rename to app/test/test.h
app/test/test_acl.c renamed from test/test/test_acl.c +0 -0
similarity index 100%
rename from test/test/test_acl.c
rename to app/test/test_acl.c
app/test/test_acl.h renamed from test/test/test_acl.h +0 -0
similarity index 100%
rename from test/test/test_acl.h
rename to app/test/test_acl.h
app/test/test_alarm.c renamed from test/test/test_alarm.c +0 -0
similarity index 100%
rename from test/test/test_alarm.c
rename to app/test/test_alarm.c
app/test/test_atomic.c renamed from test/test/test_atomic.c +0 -0
similarity index 100%
rename from test/test/test_atomic.c
rename to app/test/test_atomic.c
app/test/test_barrier.c renamed from test/test/test_barrier.c +0 -0
similarity index 100%
rename from test/test/test_barrier.c
rename to app/test/test_barrier.c
app/test/test_bitmap.c renamed from test/test/test_bitmap.c +0 -0
similarity index 100%
rename from test/test/test_bitmap.c
rename to app/test/test_bitmap.c
app/test/test_bitratestats.c renamed from test/test/test_bitratestats.c +0 -0
similarity index 100%
rename from test/test/test_bitratestats.c
rename to app/test/test_bitratestats.c
app/test/test_bpf.c renamed from test/test/test_bpf.c +0 -0
similarity index 100%
rename from test/test/test_bpf.c
rename to app/test/test_bpf.c
app/test/test_byteorder.c renamed from test/test/test_byteorder.c +0 -0
similarity index 100%
rename from test/test/test_byteorder.c
rename to app/test/test_byteorder.c
app/test/test_cfgfile.c renamed from test/test/test_cfgfile.c +0 -0
similarity index 100%
rename from test/test/test_cfgfile.c
rename to app/test/test_cfgfile.c
app/test/test_cfgfiles/etc/empty.ini renamed from test/test/test_cfgfiles/etc/empty.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/empty.ini
rename to app/test/test_cfgfiles/etc/empty.ini
app/test/test_cfgfiles/etc/empty_key_value.ini renamed from test/test/test_cfgfiles/etc/empty_key_value.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/empty_key_value.ini
rename to app/test/test_cfgfiles/etc/empty_key_value.ini
app/test/test_cfgfiles/etc/invalid_section.ini renamed from test/test/test_cfgfiles/etc/invalid_section.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/invalid_section.ini
rename to app/test/test_cfgfiles/etc/invalid_section.ini
app/test/test_cfgfiles/etc/line_too_long.ini renamed from test/test/test_cfgfiles/etc/line_too_long.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/line_too_long.ini
rename to app/test/test_cfgfiles/etc/line_too_long.ini
app/test/test_cfgfiles/etc/missing_section.ini renamed from test/test/test_cfgfiles/etc/missing_section.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/missing_section.ini
rename to app/test/test_cfgfiles/etc/missing_section.ini
app/test/test_cfgfiles/etc/realloc_sections.ini renamed from test/test/test_cfgfiles/etc/realloc_sections.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/realloc_sections.ini
rename to app/test/test_cfgfiles/etc/realloc_sections.ini
app/test/test_cfgfiles/etc/sample1.ini renamed from test/test/test_cfgfiles/etc/sample1.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/sample1.ini
rename to app/test/test_cfgfiles/etc/sample1.ini
app/test/test_cfgfiles/etc/sample2.ini renamed from test/test/test_cfgfiles/etc/sample2.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/sample2.ini
rename to app/test/test_cfgfiles/etc/sample2.ini
app/test/test_cmdline.c renamed from test/test/test_cmdline.c +0 -0
similarity index 100%
rename from test/test/test_cmdline.c
rename to app/test/test_cmdline.c
app/test/test_cmdline.h renamed from test/test/test_cmdline.h +0 -0
similarity index 100%
rename from test/test/test_cmdline.h
rename to app/test/test_cmdline.h
app/test/test_cmdline_cirbuf.c renamed from test/test/test_cmdline_cirbuf.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_cirbuf.c
rename to app/test/test_cmdline_cirbuf.c
app/test/test_cmdline_etheraddr.c renamed from test/test/test_cmdline_etheraddr.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_etheraddr.c
rename to app/test/test_cmdline_etheraddr.c
app/test/test_cmdline_ipaddr.c renamed from test/test/test_cmdline_ipaddr.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_ipaddr.c
rename to app/test/test_cmdline_ipaddr.c
app/test/test_cmdline_lib.c renamed from test/test/test_cmdline_lib.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_lib.c
rename to app/test/test_cmdline_lib.c
app/test/test_cmdline_num.c renamed from test/test/test_cmdline_num.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_num.c
rename to app/test/test_cmdline_num.c
app/test/test_cmdline_portlist.c renamed from test/test/test_cmdline_portlist.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_portlist.c
rename to app/test/test_cmdline_portlist.c
app/test/test_cmdline_string.c renamed from test/test/test_cmdline_string.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_string.c
rename to app/test/test_cmdline_string.c
app/test/test_common.c renamed from test/test/test_common.c +0 -0
similarity index 100%
rename from test/test/test_common.c
rename to app/test/test_common.c
app/test/test_compressdev.c renamed from test/test/test_compressdev.c +0 -0
similarity index 100%
rename from test/test/test_compressdev.c
rename to app/test/test_compressdev.c
app/test/test_compressdev_test_buffer.h renamed from test/test/test_compressdev_test_buffer.h +0 -0
similarity index 100%
rename from test/test/test_compressdev_test_buffer.h
rename to app/test/test_compressdev_test_buffer.h
app/test/test_cpuflags.c renamed from test/test/test_cpuflags.c +0 -0
similarity index 100%
rename from test/test/test_cpuflags.c
rename to app/test/test_cpuflags.c
app/test/test_crc.c renamed from test/test/test_crc.c +0 -0
similarity index 100%
rename from test/test/test_crc.c
rename to app/test/test_crc.c
app/test/test_cryptodev.c renamed from test/test/test_cryptodev.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev.c
rename to app/test/test_cryptodev.c
app/test/test_cryptodev.h renamed from test/test/test_cryptodev.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev.h
rename to app/test/test_cryptodev.h
app/test/test_cryptodev_aead_test_vectors.h renamed from test/test/test_cryptodev_aead_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_aead_test_vectors.h
rename to app/test/test_cryptodev_aead_test_vectors.h
app/test/test_cryptodev_aes_test_vectors.h renamed from test/test/test_cryptodev_aes_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_aes_test_vectors.h
rename to app/test/test_cryptodev_aes_test_vectors.h
app/test/test_cryptodev_asym.c renamed from test/test/test_cryptodev_asym.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev_asym.c
rename to app/test/test_cryptodev_asym.c
app/test/test_cryptodev_asym_util.h renamed from test/test/test_cryptodev_asym_util.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_asym_util.h
rename to app/test/test_cryptodev_asym_util.h
app/test/test_cryptodev_blockcipher.c renamed from test/test/test_cryptodev_blockcipher.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev_blockcipher.c
rename to app/test/test_cryptodev_blockcipher.c
app/test/test_cryptodev_blockcipher.h renamed from test/test/test_cryptodev_blockcipher.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_blockcipher.h
rename to app/test/test_cryptodev_blockcipher.h
app/test/test_cryptodev_des_test_vectors.h renamed from test/test/test_cryptodev_des_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_des_test_vectors.h
rename to app/test/test_cryptodev_des_test_vectors.h
app/test/test_cryptodev_dh_test_vectors.h renamed from test/test/test_cryptodev_dh_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_dh_test_vectors.h
rename to app/test/test_cryptodev_dh_test_vectors.h
app/test/test_cryptodev_dsa_test_vectors.h renamed from test/test/test_cryptodev_dsa_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_dsa_test_vectors.h
rename to app/test/test_cryptodev_dsa_test_vectors.h
app/test/test_cryptodev_hash_test_vectors.h renamed from test/test/test_cryptodev_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_hash_test_vectors.h
rename to app/test/test_cryptodev_hash_test_vectors.h
app/test/test_cryptodev_hmac_test_vectors.h renamed from test/test/test_cryptodev_hmac_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_hmac_test_vectors.h
rename to app/test/test_cryptodev_hmac_test_vectors.h
app/test/test_cryptodev_kasumi_hash_test_vectors.h renamed from test/test/test_cryptodev_kasumi_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_kasumi_hash_test_vectors.h
rename to app/test/test_cryptodev_kasumi_hash_test_vectors.h
app/test/test_cryptodev_kasumi_test_vectors.h renamed from test/test/test_cryptodev_kasumi_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_kasumi_test_vectors.h
rename to app/test/test_cryptodev_kasumi_test_vectors.h
app/test/test_cryptodev_mod_test_vectors.h renamed from test/test/test_cryptodev_mod_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_mod_test_vectors.h
rename to app/test/test_cryptodev_mod_test_vectors.h
app/test/test_cryptodev_rsa_test_vectors.h renamed from test/test/test_cryptodev_rsa_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_rsa_test_vectors.h
rename to app/test/test_cryptodev_rsa_test_vectors.h
app/test/test_cryptodev_snow3g_hash_test_vectors.h renamed from test/test/test_cryptodev_snow3g_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_snow3g_hash_test_vectors.h
rename to app/test/test_cryptodev_snow3g_hash_test_vectors.h
app/test/test_cryptodev_snow3g_test_vectors.h renamed from test/test/test_cryptodev_snow3g_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_snow3g_test_vectors.h
rename to app/test/test_cryptodev_snow3g_test_vectors.h
app/test/test_cryptodev_zuc_test_vectors.h renamed from test/test/test_cryptodev_zuc_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_zuc_test_vectors.h
rename to app/test/test_cryptodev_zuc_test_vectors.h
app/test/test_cycles.c renamed from test/test/test_cycles.c +0 -0
similarity index 100%
rename from test/test/test_cycles.c
rename to app/test/test_cycles.c
app/test/test_debug.c renamed from test/test/test_debug.c +0 -0
similarity index 100%
rename from test/test/test_debug.c
rename to app/test/test_debug.c
app/test/test_distributor.c renamed from test/test/test_distributor.c +0 -0
similarity index 100%
rename from test/test/test_distributor.c
rename to app/test/test_distributor.c
app/test/test_distributor_perf.c renamed from test/test/test_distributor_perf.c +0 -0
similarity index 100%
rename from test/test/test_distributor_perf.c
rename to app/test/test_distributor_perf.c
app/test/test_eal_flags.c renamed from test/test/test_eal_flags.c +0 -0
similarity index 100%
rename from test/test/test_eal_flags.c
rename to app/test/test_eal_flags.c
app/test/test_eal_fs.c renamed from test/test/test_eal_fs.c +0 -0
similarity index 100%
rename from test/test/test_eal_fs.c
rename to app/test/test_eal_fs.c
app/test/test_efd.c renamed from test/test/test_efd.c +0 -0
similarity index 100%
rename from test/test/test_efd.c
rename to app/test/test_efd.c
app/test/test_efd_perf.c renamed from test/test/test_efd_perf.c +0 -0
similarity index 100%
rename from test/test/test_efd_perf.c
rename to app/test/test_efd_perf.c
app/test/test_errno.c renamed from test/test/test_errno.c +0 -0
similarity index 100%
rename from test/test/test_errno.c
rename to app/test/test_errno.c
app/test/test_event_crypto_adapter.c renamed from test/test/test_event_crypto_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_crypto_adapter.c
rename to app/test/test_event_crypto_adapter.c
app/test/test_event_eth_rx_adapter.c renamed from test/test/test_event_eth_rx_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_eth_rx_adapter.c
rename to app/test/test_event_eth_rx_adapter.c
app/test/test_event_eth_tx_adapter.c renamed from test/test/test_event_eth_tx_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_eth_tx_adapter.c
rename to app/test/test_event_eth_tx_adapter.c
app/test/test_event_ring.c renamed from test/test/test_event_ring.c +0 -0
similarity index 100%
rename from test/test/test_event_ring.c
rename to app/test/test_event_ring.c
app/test/test_event_timer_adapter.c renamed from test/test/test_event_timer_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_timer_adapter.c
rename to app/test/test_event_timer_adapter.c
app/test/test_eventdev.c renamed from test/test/test_eventdev.c +0 -0
similarity index 100%
rename from test/test/test_eventdev.c
rename to app/test/test_eventdev.c
app/test/test_external_mem.c renamed from test/test/test_external_mem.c +0 -0
similarity index 100%
rename from test/test/test_external_mem.c
rename to app/test/test_external_mem.c
app/test/test_fbarray.c renamed from test/test/test_fbarray.c +0 -0
similarity index 100%
rename from test/test/test_fbarray.c
rename to app/test/test_fbarray.c
app/test/test_flow_classify.c renamed from test/test/test_flow_classify.c +0 -0
similarity index 100%
rename from test/test/test_flow_classify.c
rename to app/test/test_flow_classify.c
app/test/test_flow_classify.h renamed from test/test/test_flow_classify.h +0 -0
similarity index 100%
rename from test/test/test_flow_classify.h
rename to app/test/test_flow_classify.h
app/test/test_func_reentrancy.c renamed from test/test/test_func_reentrancy.c +0 -0
similarity index 100%
rename from test/test/test_func_reentrancy.c
rename to app/test/test_func_reentrancy.c
app/test/test_hash.c renamed from test/test/test_hash.c +0 -0
similarity index 100%
rename from test/test/test_hash.c
rename to app/test/test_hash.c
app/test/test_hash_functions.c renamed from test/test/test_hash_functions.c +0 -0
similarity index 100%
rename from test/test/test_hash_functions.c
rename to app/test/test_hash_functions.c
app/test/test_hash_multiwriter.c renamed from test/test/test_hash_multiwriter.c +0 -0
similarity index 100%
rename from test/test/test_hash_multiwriter.c
rename to app/test/test_hash_multiwriter.c
app/test/test_hash_perf.c renamed from test/test/test_hash_perf.c +0 -0
similarity index 100%
rename from test/test/test_hash_perf.c
rename to app/test/test_hash_perf.c
app/test/test_hash_readwrite.c renamed from test/test/test_hash_readwrite.c +0 -0
similarity index 100%
rename from test/test/test_hash_readwrite.c
rename to app/test/test_hash_readwrite.c
app/test/test_hash_readwrite_lf.c renamed from test/test/test_hash_readwrite_lf.c +0 -0
similarity index 100%
rename from test/test/test_hash_readwrite_lf.c
rename to app/test/test_hash_readwrite_lf.c
app/test/test_interrupts.c renamed from test/test/test_interrupts.c +0 -0
similarity index 100%
rename from test/test/test_interrupts.c
rename to app/test/test_interrupts.c
app/test/test_ipsec.c renamed from test/test/test_ipsec.c +0 -0
similarity index 100%
rename from test/test/test_ipsec.c
rename to app/test/test_ipsec.c
app/test/test_kni.c renamed from test/test/test_kni.c +0 -0
similarity index 100%
rename from test/test/test_kni.c
rename to app/test/test_kni.c
app/test/test_kvargs.c renamed from test/test/test_kvargs.c +0 -0
similarity index 100%
rename from test/test/test_kvargs.c
rename to app/test/test_kvargs.c
app/test/test_latencystats.c renamed from test/test/test_latencystats.c +0 -0
similarity index 100%
rename from test/test/test_latencystats.c
rename to app/test/test_latencystats.c
app/test/test_link_bonding.c renamed from test/test/test_link_bonding.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding.c
rename to app/test/test_link_bonding.c
app/test/test_link_bonding_mode4.c renamed from test/test/test_link_bonding_mode4.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding_mode4.c
rename to app/test/test_link_bonding_mode4.c
app/test/test_link_bonding_rssconf.c renamed from test/test/test_link_bonding_rssconf.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding_rssconf.c
rename to app/test/test_link_bonding_rssconf.c
app/test/test_logs.c renamed from test/test/test_logs.c +0 -0
similarity index 100%
rename from test/test/test_logs.c
rename to app/test/test_logs.c
app/test/test_lpm.c renamed from test/test/test_lpm.c +0 -0
similarity index 100%
rename from test/test/test_lpm.c
rename to app/test/test_lpm.c
app/test/test_lpm6.c renamed from test/test/test_lpm6.c +0 -0
similarity index 100%
rename from test/test/test_lpm6.c
rename to app/test/test_lpm6.c
app/test/test_lpm6_data.h renamed from test/test/test_lpm6_data.h +0 -0
similarity index 100%
rename from test/test/test_lpm6_data.h
rename to app/test/test_lpm6_data.h
app/test/test_lpm6_perf.c renamed from test/test/test_lpm6_perf.c +0 -0
similarity index 100%
rename from test/test/test_lpm6_perf.c
rename to app/test/test_lpm6_perf.c
app/test/test_lpm_perf.c renamed from test/test/test_lpm_perf.c +0 -0
similarity index 100%
rename from test/test/test_lpm_perf.c
rename to app/test/test_lpm_perf.c
app/test/test_malloc.c renamed from test/test/test_malloc.c +0 -0
similarity index 100%
rename from test/test/test_malloc.c
rename to app/test/test_malloc.c
app/test/test_mbuf.c renamed from test/test/test_mbuf.c +0 -0
similarity index 100%
rename from test/test/test_mbuf.c
rename to app/test/test_mbuf.c
app/test/test_member.c renamed from test/test/test_member.c +0 -0
similarity index 100%
rename from test/test/test_member.c
rename to app/test/test_member.c
app/test/test_member_perf.c renamed from test/test/test_member_perf.c +0 -0
similarity index 100%
rename from test/test/test_member_perf.c
rename to app/test/test_member_perf.c
app/test/test_memcpy.c renamed from test/test/test_memcpy.c +0 -0
similarity index 100%
rename from test/test/test_memcpy.c
rename to app/test/test_memcpy.c
app/test/test_memcpy_perf.c renamed from test/test/test_memcpy_perf.c +0 -0
similarity index 100%
rename from test/test/test_memcpy_perf.c
rename to app/test/test_memcpy_perf.c
app/test/test_memory.c renamed from test/test/test_memory.c +0 -0
similarity index 100%
rename from test/test/test_memory.c
rename to app/test/test_memory.c
app/test/test_mempool.c renamed from test/test/test_mempool.c +0 -0
similarity index 100%
rename from test/test/test_mempool.c
rename to app/test/test_mempool.c
app/test/test_mempool_perf.c renamed from test/test/test_mempool_perf.c +0 -0
similarity index 100%
rename from test/test/test_mempool_perf.c
rename to app/test/test_mempool_perf.c
app/test/test_memzone.c renamed from test/test/test_memzone.c +0 -0
similarity index 100%
rename from test/test/test_memzone.c
rename to app/test/test_memzone.c
app/test/test_meter.c renamed from test/test/test_meter.c +0 -0
similarity index 100%
rename from test/test/test_meter.c
rename to app/test/test_meter.c
app/test/test_metrics.c renamed from test/test/test_metrics.c +0 -0
similarity index 100%
rename from test/test/test_metrics.c
rename to app/test/test_metrics.c
app/test/test_mp_secondary.c renamed from test/test/test_mp_secondary.c +0 -0
similarity index 100%
rename from test/test/test_mp_secondary.c
rename to app/test/test_mp_secondary.c
app/test/test_pdump.c renamed from test/test/test_pdump.c +0 -0
similarity index 100%
rename from test/test/test_pdump.c
rename to app/test/test_pdump.c
app/test/test_pdump.h renamed from test/test/test_pdump.h +0 -0
similarity index 100%
rename from test/test/test_pdump.h
rename to app/test/test_pdump.h
app/test/test_per_lcore.c renamed from test/test/test_per_lcore.c +0 -0
similarity index 100%
rename from test/test/test_per_lcore.c
rename to app/test/test_per_lcore.c
app/test/test_pmd_perf.c renamed from test/test/test_pmd_perf.c +0 -0
similarity index 100%
rename from test/test/test_pmd_perf.c
rename to app/test/test_pmd_perf.c
app/test/test_pmd_ring.c renamed from test/test/test_pmd_ring.c +0 -0
similarity index 100%
rename from test/test/test_pmd_ring.c
rename to app/test/test_pmd_ring.c
app/test/test_pmd_ring_perf.c renamed from test/test/test_pmd_ring_perf.c +0 -0
similarity index 100%
rename from test/test/test_pmd_ring_perf.c
rename to app/test/test_pmd_ring_perf.c
app/test/test_power.c renamed from test/test/test_power.c +0 -0
similarity index 100%
rename from test/test/test_power.c
rename to app/test/test_power.c
app/test/test_power_acpi_cpufreq.c renamed from test/test/test_power_acpi_cpufreq.c +0 -0
similarity index 100%
rename from test/test/test_power_acpi_cpufreq.c
rename to app/test/test_power_acpi_cpufreq.c
app/test/test_power_kvm_vm.c renamed from test/test/test_power_kvm_vm.c +0 -0
similarity index 100%
rename from test/test/test_power_kvm_vm.c
rename to app/test/test_power_kvm_vm.c
app/test/test_prefetch.c renamed from test/test/test_prefetch.c +0 -0
similarity index 100%
rename from test/test/test_prefetch.c
rename to app/test/test_prefetch.c
app/test/test_rawdev.c renamed from test/test/test_rawdev.c +0 -0
similarity index 100%
rename from test/test/test_rawdev.c
rename to app/test/test_rawdev.c
app/test/test_reciprocal_division.c renamed from test/test/test_reciprocal_division.c +0 -0
similarity index 100%
rename from test/test/test_reciprocal_division.c
rename to app/test/test_reciprocal_division.c
app/test/test_reciprocal_division_perf.c renamed from test/test/test_reciprocal_division_perf.c +0 -0
similarity index 100%
rename from test/test/test_reciprocal_division_perf.c
rename to app/test/test_reciprocal_division_perf.c
app/test/test_red.c renamed from test/test/test_red.c +0 -0
similarity index 100%
rename from test/test/test_red.c
rename to app/test/test_red.c
app/test/test_reorder.c renamed from test/test/test_reorder.c +0 -0
similarity index 100%
rename from test/test/test_reorder.c
rename to app/test/test_reorder.c
app/test/test_resource.c renamed from test/test/test_resource.c +0 -0
similarity index 100%
rename from test/test/test_resource.c
rename to app/test/test_resource.c
app/test/test_ring.c renamed from test/test/test_ring.c +0 -0
similarity index 100%
rename from test/test/test_ring.c
rename to app/test/test_ring.c
app/test/test_ring_perf.c renamed from test/test/test_ring_perf.c +0 -0
similarity index 100%
rename from test/test/test_ring_perf.c
rename to app/test/test_ring_perf.c
app/test/test_rwlock.c renamed from test/test/test_rwlock.c +0 -0
similarity index 100%
rename from test/test/test_rwlock.c
rename to app/test/test_rwlock.c
app/test/test_sched.c renamed from test/test/test_sched.c +0 -0
similarity index 100%
rename from test/test/test_sched.c
rename to app/test/test_sched.c
app/test/test_service_cores.c renamed from test/test/test_service_cores.c +0 -0
similarity index 100%
rename from test/test/test_service_cores.c
rename to app/test/test_service_cores.c
app/test/test_spinlock.c renamed from test/test/test_spinlock.c +0 -0
similarity index 100%
rename from test/test/test_spinlock.c
rename to app/test/test_spinlock.c
app/test/test_string_fns.c renamed from test/test/test_string_fns.c +0 -0
similarity index 100%
rename from test/test/test_string_fns.c
rename to app/test/test_string_fns.c
app/test/test_table.c renamed from test/test/test_table.c +0 -0
similarity index 100%
rename from test/test/test_table.c
rename to app/test/test_table.c
app/test/test_table.h renamed from test/test/test_table.h +0 -0
similarity index 100%
rename from test/test/test_table.h
rename to app/test/test_table.h
app/test/test_table_acl.c renamed from test/test/test_table_acl.c +0 -0
similarity index 100%
rename from test/test/test_table_acl.c
rename to app/test/test_table_acl.c
app/test/test_table_acl.h renamed from test/test/test_table_acl.h +0 -0
similarity index 100%
rename from test/test/test_table_acl.h
rename to app/test/test_table_acl.h
app/test/test_table_combined.c renamed from test/test/test_table_combined.c +0 -0
similarity index 100%
rename from test/test/test_table_combined.c
rename to app/test/test_table_combined.c
app/test/test_table_combined.h renamed from test/test/test_table_combined.h +0 -0
similarity index 100%
rename from test/test/test_table_combined.h
rename to app/test/test_table_combined.h
app/test/test_table_pipeline.c renamed from test/test/test_table_pipeline.c +0 -0
similarity index 100%
rename from test/test/test_table_pipeline.c
rename to app/test/test_table_pipeline.c
app/test/test_table_pipeline.h renamed from test/test/test_table_pipeline.h +0 -0
similarity index 100%
rename from test/test/test_table_pipeline.h
rename to app/test/test_table_pipeline.h
app/test/test_table_ports.c renamed from test/test/test_table_ports.c +0 -0
similarity index 100%
rename from test/test/test_table_ports.c
rename to app/test/test_table_ports.c
app/test/test_table_ports.h renamed from test/test/test_table_ports.h +0 -0
similarity index 100%
rename from test/test/test_table_ports.h
rename to app/test/test_table_ports.h
app/test/test_table_tables.c renamed from test/test/test_table_tables.c +0 -0
similarity index 100%
rename from test/test/test_table_tables.c
rename to app/test/test_table_tables.c
app/test/test_table_tables.h renamed from test/test/test_table_tables.h +0 -0
similarity index 100%
rename from test/test/test_table_tables.h
rename to app/test/test_table_tables.h
app/test/test_tailq.c renamed from test/test/test_tailq.c +0 -0
similarity index 100%
rename from test/test/test_tailq.c
rename to app/test/test_tailq.c
app/test/test_thash.c renamed from test/test/test_thash.c +0 -0
similarity index 100%
rename from test/test/test_thash.c
rename to app/test/test_thash.c
app/test/test_timer.c renamed from test/test/test_timer.c +0 -0
similarity index 100%
rename from test/test/test_timer.c
rename to app/test/test_timer.c
app/test/test_timer_perf.c renamed from test/test/test_timer_perf.c +0 -0
similarity index 100%
rename from test/test/test_timer_perf.c
rename to app/test/test_timer_perf.c
app/test/test_timer_racecond.c renamed from test/test/test_timer_racecond.c +0 -0
similarity index 100%
rename from test/test/test_timer_racecond.c
rename to app/test/test_timer_racecond.c
app/test/test_version.c renamed from test/test/test_version.c +0 -0
similarity index 100%
rename from test/test/test_version.c
rename to app/test/test_version.c
app/test/test_xmmt_ops.h renamed from test/test/test_xmmt_ops.h +0 -0
similarity index 100%
rename from test/test/test_xmmt_ops.h
rename to app/test/test_xmmt_ops.h
app/test/virtual_pmd.c renamed from test/test/virtual_pmd.c +0 -0
similarity index 100%
rename from test/test/virtual_pmd.c
rename to app/test/virtual_pmd.c
app/test/virtual_pmd.h renamed from test/test/virtual_pmd.h +0 -0
similarity index 100%
rename from test/test/virtual_pmd.h
rename to app/test/virtual_pmd.h
devtools/test-build.sh +0 -3
index 42f4ad003..54b10ef63 100755
@@ -223,9 +223,6 @@ for conf in $configs ; do
 	make -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
 		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	! $short || break
-	echo "================== Build tests for $dir"
-	make test-build -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	echo "================== Build examples for $dir"
 	export RTE_SDK=$(pwd)
 	export RTE_TARGET=$dir
doc/guides/compressdevs/octeontx.rst +1 -1
index 05dbd681b..c57d03a8e 100644
@@ -99,7 +99,7 @@ probed. To use the PMD in an application, user must:
       cd to the top-level DPDK directory
       export RTE_TARGET=arm64-thunderx-linuxapp-gcc
       export RTE_SDK=`pwd`
-      cd to test/test
+      cd to app/test
       type the command "make" to compile
       run the tests with "./test"
       type the command "compressdev_autotest" to test
doc/guides/cryptodevs/qat.rst +2 -2
index b079aa381..9207bfa55 100644
@@ -530,7 +530,7 @@ Testing
 QAT crypto PMD can be tested by running the test application::
 
     make defconfig
-    make test-build -j
+    make -j
     cd ./build/app
     ./test -l1 -n1 -w <your qat bdf>
     RTE>>cryptodev_qat_autotest
@@ -539,7 +539,7 @@ QAT compression PMD can be tested by running the test application::
 
     make defconfig
     sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config
-    make test-build -j
+    make -j
     cd ./build/app
     ./test -l1 -n1 -w <your qat bdf>
     RTE>>compressdev_autotest
doc/guides/cryptodevs/virtio.rst +1 -1
index f3aa7c654..cfc6d57d7 100644
@@ -93,7 +93,7 @@ The unit test cases can be tested as below:
     cd to the top-level DPDK directory
     export RTE_TARGET=x86_64-native-linuxapp-gcc
     export RTE_SDK=`pwd`
-    cd to test/test
+    cd to app/test
     type the command "make" to compile
     run the tests with "./test"
     type the command "cryptodev_virtio_autotest" to test
doc/guides/mempool/octeontx.rst +1 -1
index e05aeb94c..3ade61fc2 100644
@@ -56,7 +56,7 @@ following ``make`` command:
 .. code-block:: console
 
    cd <DPDK-source-directory>
-   make config T=arm64-thunderx-linuxapp-gcc test-build
+   make config T=arm64-thunderx-linuxapp-gcc
 
 
 Initialization
doc/guides/prog_guide/compressdev.rst +1 -1
index 87e264906..ad9703753 100644
@@ -615,7 +615,7 @@ Sample code
 -----------
 
 There are unit test applications that show how to use the compressdev library inside
-test/test/test_compressdev.c
+app/test/test_compressdev.c
 
 Compression Device API
 ~~~~~~~~~~~~~~~~~~~~~~
meson.build +0 -1
index 7f5e8674b..7de6e2193 100644
@@ -43,7 +43,6 @@ subdir('drivers')
 # build binaries and installable tools
 subdir('usertools')
 subdir('app')
-subdir('test')
 
 # build docs
 subdir('doc')
mk/rte.sdkbuild.mk +0 -3
index 5dc43e429..b512de1ec 100644
@@ -40,9 +40,6 @@ clean: $(CLEANDIRS)
 	$(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean
 	@echo Clean complete
 
-.PHONY: test-build
-test-build: test
-
 .SECONDEXPANSION:
 .PHONY: $(ROOTDIRS-y) $(ROOTDIRS-)
 $(ROOTDIRS-y) $(ROOTDIRS-):
mk/rte.sdkroot.mk +2 -4
index 18c88017e..d91583a63 100644
@@ -57,8 +57,8 @@ export BUILDDIR
 
 export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n
 
-.PHONY: default
-default: all
+.PHONY: default test-build
+default test-build: all
 
 .PHONY: config defconfig showconfigs showversion showversionum
 config defconfig showconfigs showversion showversionum:
@@ -72,8 +72,6 @@ cscope gtags tags etags:
 test test-fast test-perf coverage test-drivers test-dump:
 	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
 
-test: test-build
-
 .PHONY: install
 install:
 	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install
mk/rte.sdktest.mk +4 -4
index 295592809..803018ba3 100644
@@ -49,12 +49,12 @@ test test-fast test-perf test-drivers test-dump:
 	@mkdir -p $(AUTOTEST_DIR) ; \
 	cd $(AUTOTEST_DIR) ; \
 	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/test/test/autotest.py \
+		python $(RTE_SDK)/app/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST); \
 	else \
-		echo "No test found, please do a 'make test-build' first, or specify O=" ; \
+		echo "No test found, please do a 'make' first, or specify O=" ; \
 	fi
 
 # this is a special target to ease the pain of running coverage tests
@@ -66,11 +66,11 @@ coverage:
 		python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
 			$(RTE_OUTPUT)/app/cmdline_test; \
 		ulimit -S -n 100 ; \
-		python $(RTE_SDK)/test/test/autotest.py \
+		python $(RTE_SDK)/app/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST) ; \
 		$(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
 	else \
-		echo "No test found, please do a 'make test-build' first, or specify O=" ;\
+		echo "No test found, please do a 'make' first, or specify O=" ;\
 	fi
test/Makefile deleted +0 -8
deleted file mode 100644
index e9ae64b59..000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_APP_TEST) += test
-
-include $(RTE_SDK)/mk/rte.subdir.mk
test/meson.build deleted +0 -4
deleted file mode 100644
index 3ad11b34f..000000000
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-subdir('test')
Signature · 1 line
2.20.1
#23 lore raw

Re: [PATCH v2 0/5] consolidate testing apps to app dir

In reply to Bruce Richardson
Quoted 11 lines · Bruce Richardson

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

Quoted 5 lines

With these changes, the "test" folder then becomes the location for unit tests only. However, we can simplify things a little by moving that too to the app folder, eliminating the need for the separate "test-build" make target, and aligning the output folder for the binary from "make test-build" with the source file location in app.

I agree distinction between the "test" and "app" is not very clear, my motivation to split them was make building test code optional.

But when split them we have a few cases that tests broken but not recognized for a while, since we don't have continuous integration that verifies tests perhaps it can be better to force developers to build them each time to detect issues.

And as far as I understand this split is causing complications for adding meson support, if this will make easy to extend meson support overall patchset looks good to me.

Thanks,
ferruh

Quoted 12 lines

---
V2: * Following some discussion with Thomas, moved the autotests to the
app folder too.
* Updated maintainers file appropriately in each patch.

Bruce Richardson (5):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder
test/test: move to app folder

#24 lore raw

Re: [PATCH v2 0/5] consolidate testing apps to app dir

Quoted 25 lines · Ferruh Yigit
Quoted 11 lines · Bruce Richardson

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

Quoted 5 lines

With these changes, the "test" folder then becomes the location for unit tests only. However, we can simplify things a little by moving that too to the app folder, eliminating the need for the separate "test-build" make target, and aligning the output folder for the binary from "make test-build" with the source file location in app.

I agree distinction between the "test" and "app" is not very clear, my motivation to split them was make building test code optional.

But when split them we have a few cases that tests broken but not recognized for a while, since we don't have continuous integration that verifies tests perhaps it can be better to force developers to build them each time to detect issues.

Quoted 7 lines

And as far as I understand this split is causing complications for adding meson support, if this will make easy to extend meson support overall patchset looks good to me.

Thanks,
ferruh

Ping for any further comment or ack. Since this involves moving a lot of files it would be good to get in early to avoid conflicts with later patches which may touch those same files.

Thanks,
/Bruce

#25 lore raw

v3 cover consolidate testing apps to app dir

In reply to Bruce Richardson

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only. However, we can simplify things a little by moving that too to the app folder, eliminating the need for the separate "test-build" make target, and aligning the output folder for the binary from "make test-build" with the source file location in app.

---
V3: * Renamed the cmdline_test subdirectory to test-cmdline as part of the
move.
V2: * Following some discussion with Thomas, moved the autotests to the
app folder too.
* Updated maintainers file appropriately in each patch.

Bruce Richardson (5):
test/cmdline_test: move to app directory
test/test-acl: move to app directory
test/test-pipeline: move to app directory
test/bpf: move to examples folder
test/test: move to app folder

 GNUmakefile                                   |   1 -
 MAINTAINERS                                   | 190 +++++++++---------
 app/Makefile                                  |   4 +
 app/meson.build                               |   9 +-
 {test => app}/test-acl/Makefile               |   0
 {test => app}/test-acl/main.c                 |   0
 app/test-acl/meson.build                      |   5 +
 .../test-cmdline}/Makefile                    |   0
 .../test-cmdline}/cmdline_test.c              |   0
 .../test-cmdline}/cmdline_test.h              |   0
 .../test-cmdline}/cmdline_test.py             |   0
 .../test-cmdline}/cmdline_test_data.py        |   0
 .../test-cmdline}/commands.c                  |   0
 app/test-cmdline/meson.build                  |   5 +
 {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-pipeline/pipeline_lpm_ipv6.c         |   0
 {test => app}/test-pipeline/pipeline_stub.c   |   0
 {test => app}/test-pipeline/runtime.c         |   0
 {test => app}/test/Makefile                   |   0
 {test => app}/test/autotest.py                |   0
 {test => app}/test/autotest_data.py           |   0
 {test => app}/test/autotest_runner.py         |   0
 {test => app}/test/autotest_test_funcs.py     |   0
 {test => app}/test/commands.c                 |   0
 {test => app}/test/meson.build                |   0
 {test => app}/test/packet_burst_generator.c   |   0
 {test => app}/test/packet_burst_generator.h   |   0
 {test => app}/test/process.h                  |   0
 {test => app}/test/resource.c                 |   0
 {test => app}/test/resource.h                 |   0
 {test => app}/test/sample_packet_forward.c    |   0
 {test => app}/test/sample_packet_forward.h    |   0
 {test => app}/test/test.c                     |   0
 {test => app}/test/test.h                     |   0
 {test => app}/test/test_acl.c                 |   0
 {test => app}/test/test_acl.h                 |   0
 {test => app}/test/test_alarm.c               |   0
 {test => app}/test/test_atomic.c              |   0
 {test => app}/test/test_barrier.c             |   0
 {test => app}/test/test_bitmap.c              |   0
 {test => app}/test/test_bitratestats.c        |   0
 {test => app}/test/test_bpf.c                 |   0
 {test => app}/test/test_byteorder.c           |   0
 {test => app}/test/test_cfgfile.c             |   0
 .../test/test_cfgfiles/etc/empty.ini          |   0
 .../test_cfgfiles/etc/empty_key_value.ini     |   0
 .../test_cfgfiles/etc/invalid_section.ini     |   0
 .../test/test_cfgfiles/etc/line_too_long.ini  |   0
 .../test_cfgfiles/etc/missing_section.ini     |   0
 .../test_cfgfiles/etc/realloc_sections.ini    |   0
 .../test/test_cfgfiles/etc/sample1.ini        |   0
 .../test/test_cfgfiles/etc/sample2.ini        |   0
 {test => app}/test/test_cmdline.c             |   0
 {test => app}/test/test_cmdline.h             |   0
 {test => app}/test/test_cmdline_cirbuf.c      |   0
 {test => app}/test/test_cmdline_etheraddr.c   |   0
 {test => app}/test/test_cmdline_ipaddr.c      |   0
 {test => app}/test/test_cmdline_lib.c         |   0
 {test => app}/test/test_cmdline_num.c         |   0
 {test => app}/test/test_cmdline_portlist.c    |   0
 {test => app}/test/test_cmdline_string.c      |   0
 {test => app}/test/test_common.c              |   0
 {test => app}/test/test_compressdev.c         |   0
 .../test/test_compressdev_test_buffer.h       |   0
 {test => app}/test/test_cpuflags.c            |   0
 {test => app}/test/test_crc.c                 |   0
 {test => app}/test/test_cryptodev.c           |   0
 {test => app}/test/test_cryptodev.h           |   0
 .../test/test_cryptodev_aead_test_vectors.h   |   0
 .../test/test_cryptodev_aes_test_vectors.h    |   0
 {test => app}/test/test_cryptodev_asym.c      |   0
 {test => app}/test/test_cryptodev_asym_util.h |   0
 .../test/test_cryptodev_blockcipher.c         |   0
 .../test/test_cryptodev_blockcipher.h         |   0
 .../test/test_cryptodev_des_test_vectors.h    |   0
 .../test/test_cryptodev_dh_test_vectors.h     |   0
 .../test/test_cryptodev_dsa_test_vectors.h    |   0
 .../test/test_cryptodev_hash_test_vectors.h   |   0
 .../test/test_cryptodev_hmac_test_vectors.h   |   0
 .../test_cryptodev_kasumi_hash_test_vectors.h |   0
 .../test/test_cryptodev_kasumi_test_vectors.h |   0
 .../test/test_cryptodev_mod_test_vectors.h    |   0
 .../test/test_cryptodev_rsa_test_vectors.h    |   0
 .../test_cryptodev_snow3g_hash_test_vectors.h |   0
 .../test/test_cryptodev_snow3g_test_vectors.h |   0
 .../test/test_cryptodev_zuc_test_vectors.h    |   0
 {test => app}/test/test_cycles.c              |   0
 {test => app}/test/test_debug.c               |   0
 {test => app}/test/test_distributor.c         |   0
 {test => app}/test/test_distributor_perf.c    |   0
 {test => app}/test/test_eal_flags.c           |   0
 {test => app}/test/test_eal_fs.c              |   0
 {test => app}/test/test_efd.c                 |   0
 {test => app}/test/test_efd_perf.c            |   0
 {test => app}/test/test_errno.c               |   0
 .../test/test_event_crypto_adapter.c          |   0
 .../test/test_event_eth_rx_adapter.c          |   0
 .../test/test_event_eth_tx_adapter.c          |   0
 {test => app}/test/test_event_ring.c          |   0
 {test => app}/test/test_event_timer_adapter.c |   0
 {test => app}/test/test_eventdev.c            |   0
 {test => app}/test/test_external_mem.c        |   0
 {test => app}/test/test_fbarray.c             |   0
 {test => app}/test/test_flow_classify.c       |   0
 {test => app}/test/test_flow_classify.h       |   0
 {test => app}/test/test_func_reentrancy.c     |   0
 {test => app}/test/test_hash.c                |   0
 {test => app}/test/test_hash_functions.c      |   0
 {test => app}/test/test_hash_multiwriter.c    |   0
 {test => app}/test/test_hash_perf.c           |   0
 {test => app}/test/test_hash_readwrite.c      |   0
 {test => app}/test/test_hash_readwrite_lf.c   |   0
 {test => app}/test/test_interrupts.c          |   0
 {test => app}/test/test_ipsec.c               |   0
 {test => app}/test/test_kni.c                 |   0
 {test => app}/test/test_kvargs.c              |   0
 {test => app}/test/test_latencystats.c        |   0
 {test => app}/test/test_link_bonding.c        |   0
 {test => app}/test/test_link_bonding_mode4.c  |   0
 .../test/test_link_bonding_rssconf.c          |   0
 {test => app}/test/test_logs.c                |   0
 {test => app}/test/test_lpm.c                 |   0
 {test => app}/test/test_lpm6.c                |   0
 {test => app}/test/test_lpm6_data.h           |   0
 {test => app}/test/test_lpm6_perf.c           |   0
 {test => app}/test/test_lpm_perf.c            |   0
 {test => app}/test/test_malloc.c              |   0
 {test => app}/test/test_mbuf.c                |   0
 {test => app}/test/test_member.c              |   0
 {test => app}/test/test_member_perf.c         |   0
 {test => app}/test/test_memcpy.c              |   0
 {test => app}/test/test_memcpy_perf.c         |   0
 {test => app}/test/test_memory.c              |   0
 {test => app}/test/test_mempool.c             |   0
 {test => app}/test/test_mempool_perf.c        |   0
 {test => app}/test/test_memzone.c             |   0
 {test => app}/test/test_meter.c               |   0
 {test => app}/test/test_metrics.c             |   0
 {test => app}/test/test_mp_secondary.c        |   0
 {test => app}/test/test_pdump.c               |   0
 {test => app}/test/test_pdump.h               |   0
 {test => app}/test/test_per_lcore.c           |   0
 {test => app}/test/test_pmd_perf.c            |   0
 {test => app}/test/test_pmd_ring.c            |   0
 {test => app}/test/test_pmd_ring_perf.c       |   0
 {test => app}/test/test_power.c               |   0
 {test => app}/test/test_power_acpi_cpufreq.c  |   0
 {test => app}/test/test_power_kvm_vm.c        |   0
 {test => app}/test/test_prefetch.c            |   0
 {test => app}/test/test_rawdev.c              |   0
 {test => app}/test/test_reciprocal_division.c |   0
 .../test/test_reciprocal_division_perf.c      |   0
 {test => app}/test/test_red.c                 |   0
 {test => app}/test/test_reorder.c             |   0
 {test => app}/test/test_resource.c            |   0
 {test => app}/test/test_ring.c                |   0
 {test => app}/test/test_ring_perf.c           |   0
 {test => app}/test/test_rwlock.c              |   0
 {test => app}/test/test_sched.c               |   0
 {test => app}/test/test_service_cores.c       |   0
 {test => app}/test/test_spinlock.c            |   0
 {test => app}/test/test_string_fns.c          |   0
 {test => app}/test/test_table.c               |   0
 {test => app}/test/test_table.h               |   0
 {test => app}/test/test_table_acl.c           |   0
 {test => app}/test/test_table_acl.h           |   0
 {test => app}/test/test_table_combined.c      |   0
 {test => app}/test/test_table_combined.h      |   0
 {test => app}/test/test_table_pipeline.c      |   0
 {test => app}/test/test_table_pipeline.h      |   0
 {test => app}/test/test_table_ports.c         |   0
 {test => app}/test/test_table_ports.h         |   0
 {test => app}/test/test_table_tables.c        |   0
 {test => app}/test/test_table_tables.h        |   0
 {test => app}/test/test_tailq.c               |   0
 {test => app}/test/test_thash.c               |   0
 {test => app}/test/test_timer.c               |   0
 {test => app}/test/test_timer_perf.c          |   0
 {test => app}/test/test_timer_racecond.c      |   0
 {test => app}/test/test_version.c             |   0
 {test => app}/test/test_xmmt_ops.h            |   0
 {test => app}/test/virtual_pmd.c              |   0
 {test => app}/test/virtual_pmd.h              |   0
 devtools/test-build.sh                        |   3 -
 doc/guides/compressdevs/octeontx.rst          |   2 +-
 doc/guides/cryptodevs/qat.rst                 |   4 +-
 doc/guides/cryptodevs/virtio.rst              |   2 +-
 doc/guides/mempool/octeontx.rst               |   2 +-
 doc/guides/prog_guide/compressdev.rst         |   2 +-
 doc/guides/sample_app_ug/test_pipeline.rst    |   2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst   |   8 +-
 examples/bpf/README                           |   8 +
 {test => examples}/bpf/dummy.c                |   0
 {test => examples}/bpf/mbuf.h                 |   0
 examples/bpf/meson.build                      |   6 +
 {test => examples}/bpf/t1.c                   |   0
 {test => examples}/bpf/t2.c                   |   0
 {test => examples}/bpf/t3.c                   |   0
 meson.build                                   |   1 -
 mk/rte.sdkbuild.mk                            |   3 -
 mk/rte.sdkroot.mk                             |   6 +-
 mk/rte.sdktest.mk                             |   8 +-
 test/Makefile                                 |  11 -
 test/meson.build                              |   4 -
 212 files changed, 162 insertions(+), 138 deletions(-)
 rename {test => app}/test-acl/Makefile (100%)
 rename {test => app}/test-acl/main.c (100%)
 create mode 100644 app/test-acl/meson.build
 rename {test/cmdline_test => app/test-cmdline}/Makefile (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.c (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.h (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.py (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test_data.py (100%)
 rename {test/cmdline_test => app/test-cmdline}/commands.c (100%)
 create mode 100644 app/test-cmdline/meson.build
 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%)
 rename {test => app}/test/Makefile (100%)
 rename {test => app}/test/autotest.py (100%)
 rename {test => app}/test/autotest_data.py (100%)
 rename {test => app}/test/autotest_runner.py (100%)
 rename {test => app}/test/autotest_test_funcs.py (100%)
 rename {test => app}/test/commands.c (100%)
 rename {test => app}/test/meson.build (100%)
 rename {test => app}/test/packet_burst_generator.c (100%)
 rename {test => app}/test/packet_burst_generator.h (100%)
 rename {test => app}/test/process.h (100%)
 rename {test => app}/test/resource.c (100%)
 rename {test => app}/test/resource.h (100%)
 rename {test => app}/test/sample_packet_forward.c (100%)
 rename {test => app}/test/sample_packet_forward.h (100%)
 rename {test => app}/test/test.c (100%)
 rename {test => app}/test/test.h (100%)
 rename {test => app}/test/test_acl.c (100%)
 rename {test => app}/test/test_acl.h (100%)
 rename {test => app}/test/test_alarm.c (100%)
 rename {test => app}/test/test_atomic.c (100%)
 rename {test => app}/test/test_barrier.c (100%)
 rename {test => app}/test/test_bitmap.c (100%)
 rename {test => app}/test/test_bitratestats.c (100%)
 rename {test => app}/test/test_bpf.c (100%)
 rename {test => app}/test/test_byteorder.c (100%)
 rename {test => app}/test/test_cfgfile.c (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty_key_value.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/invalid_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/line_too_long.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/missing_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/realloc_sections.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample1.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample2.ini (100%)
 rename {test => app}/test/test_cmdline.c (100%)
 rename {test => app}/test/test_cmdline.h (100%)
 rename {test => app}/test/test_cmdline_cirbuf.c (100%)
 rename {test => app}/test/test_cmdline_etheraddr.c (100%)
 rename {test => app}/test/test_cmdline_ipaddr.c (100%)
 rename {test => app}/test/test_cmdline_lib.c (100%)
 rename {test => app}/test/test_cmdline_num.c (100%)
 rename {test => app}/test/test_cmdline_portlist.c (100%)
 rename {test => app}/test/test_cmdline_string.c (100%)
 rename {test => app}/test/test_common.c (100%)
 rename {test => app}/test/test_compressdev.c (100%)
 rename {test => app}/test/test_compressdev_test_buffer.h (100%)
 rename {test => app}/test/test_cpuflags.c (100%)
 rename {test => app}/test/test_crc.c (100%)
 rename {test => app}/test/test_cryptodev.c (100%)
 rename {test => app}/test/test_cryptodev.h (100%)
 rename {test => app}/test/test_cryptodev_aead_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_aes_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_asym.c (100%)
 rename {test => app}/test/test_cryptodev_asym_util.h (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.c (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.h (100%)
 rename {test => app}/test/test_cryptodev_des_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dh_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hmac_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_mod_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_rsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_zuc_test_vectors.h (100%)
 rename {test => app}/test/test_cycles.c (100%)
 rename {test => app}/test/test_debug.c (100%)
 rename {test => app}/test/test_distributor.c (100%)
 rename {test => app}/test/test_distributor_perf.c (100%)
 rename {test => app}/test/test_eal_flags.c (100%)
 rename {test => app}/test/test_eal_fs.c (100%)
 rename {test => app}/test/test_efd.c (100%)
 rename {test => app}/test/test_efd_perf.c (100%)
 rename {test => app}/test/test_errno.c (100%)
 rename {test => app}/test/test_event_crypto_adapter.c (100%)
 rename {test => app}/test/test_event_eth_rx_adapter.c (100%)
 rename {test => app}/test/test_event_eth_tx_adapter.c (100%)
 rename {test => app}/test/test_event_ring.c (100%)
 rename {test => app}/test/test_event_timer_adapter.c (100%)
 rename {test => app}/test/test_eventdev.c (100%)
 rename {test => app}/test/test_external_mem.c (100%)
 rename {test => app}/test/test_fbarray.c (100%)
 rename {test => app}/test/test_flow_classify.c (100%)
 rename {test => app}/test/test_flow_classify.h (100%)
 rename {test => app}/test/test_func_reentrancy.c (100%)
 rename {test => app}/test/test_hash.c (100%)
 rename {test => app}/test/test_hash_functions.c (100%)
 rename {test => app}/test/test_hash_multiwriter.c (100%)
 rename {test => app}/test/test_hash_perf.c (100%)
 rename {test => app}/test/test_hash_readwrite.c (100%)
 rename {test => app}/test/test_hash_readwrite_lf.c (100%)
 rename {test => app}/test/test_interrupts.c (100%)
 rename {test => app}/test/test_ipsec.c (100%)
 rename {test => app}/test/test_kni.c (100%)
 rename {test => app}/test/test_kvargs.c (100%)
 rename {test => app}/test/test_latencystats.c (100%)
 rename {test => app}/test/test_link_bonding.c (100%)
 rename {test => app}/test/test_link_bonding_mode4.c (100%)
 rename {test => app}/test/test_link_bonding_rssconf.c (100%)
 rename {test => app}/test/test_logs.c (100%)
 rename {test => app}/test/test_lpm.c (100%)
 rename {test => app}/test/test_lpm6.c (100%)
 rename {test => app}/test/test_lpm6_data.h (100%)
 rename {test => app}/test/test_lpm6_perf.c (100%)
 rename {test => app}/test/test_lpm_perf.c (100%)
 rename {test => app}/test/test_malloc.c (100%)
 rename {test => app}/test/test_mbuf.c (100%)
 rename {test => app}/test/test_member.c (100%)
 rename {test => app}/test/test_member_perf.c (100%)
 rename {test => app}/test/test_memcpy.c (100%)
 rename {test => app}/test/test_memcpy_perf.c (100%)
 rename {test => app}/test/test_memory.c (100%)
 rename {test => app}/test/test_mempool.c (100%)
 rename {test => app}/test/test_mempool_perf.c (100%)
 rename {test => app}/test/test_memzone.c (100%)
 rename {test => app}/test/test_meter.c (100%)
 rename {test => app}/test/test_metrics.c (100%)
 rename {test => app}/test/test_mp_secondary.c (100%)
 rename {test => app}/test/test_pdump.c (100%)
 rename {test => app}/test/test_pdump.h (100%)
 rename {test => app}/test/test_per_lcore.c (100%)
 rename {test => app}/test/test_pmd_perf.c (100%)
 rename {test => app}/test/test_pmd_ring.c (100%)
 rename {test => app}/test/test_pmd_ring_perf.c (100%)
 rename {test => app}/test/test_power.c (100%)
 rename {test => app}/test/test_power_acpi_cpufreq.c (100%)
 rename {test => app}/test/test_power_kvm_vm.c (100%)
 rename {test => app}/test/test_prefetch.c (100%)
 rename {test => app}/test/test_rawdev.c (100%)
 rename {test => app}/test/test_reciprocal_division.c (100%)
 rename {test => app}/test/test_reciprocal_division_perf.c (100%)
 rename {test => app}/test/test_red.c (100%)
 rename {test => app}/test/test_reorder.c (100%)
 rename {test => app}/test/test_resource.c (100%)
 rename {test => app}/test/test_ring.c (100%)
 rename {test => app}/test/test_ring_perf.c (100%)
 rename {test => app}/test/test_rwlock.c (100%)
 rename {test => app}/test/test_sched.c (100%)
 rename {test => app}/test/test_service_cores.c (100%)
 rename {test => app}/test/test_spinlock.c (100%)
 rename {test => app}/test/test_string_fns.c (100%)
 rename {test => app}/test/test_table.c (100%)
 rename {test => app}/test/test_table.h (100%)
 rename {test => app}/test/test_table_acl.c (100%)
 rename {test => app}/test/test_table_acl.h (100%)
 rename {test => app}/test/test_table_combined.c (100%)
 rename {test => app}/test/test_table_combined.h (100%)
 rename {test => app}/test/test_table_pipeline.c (100%)
 rename {test => app}/test/test_table_pipeline.h (100%)
 rename {test => app}/test/test_table_ports.c (100%)
 rename {test => app}/test/test_table_ports.h (100%)
 rename {test => app}/test/test_table_tables.c (100%)
 rename {test => app}/test/test_table_tables.h (100%)
 rename {test => app}/test/test_tailq.c (100%)
 rename {test => app}/test/test_thash.c (100%)
 rename {test => app}/test/test_timer.c (100%)
 rename {test => app}/test/test_timer_perf.c (100%)
 rename {test => app}/test/test_timer_racecond.c (100%)
 rename {test => app}/test/test_version.c (100%)
 rename {test => app}/test/test_xmmt_ops.h (100%)
 rename {test => app}/test/virtual_pmd.c (100%)
 rename {test => app}/test/virtual_pmd.h (100%)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
 delete mode 100644 test/Makefile
 delete mode 100644 test/meson.build
Signature · 1 line
2.20.1
#26 lore raw

PATCH v3 1/5 test/cmdline_test: move to app directory

Move app to "app" directory and enable with meson build. For consistency of naming, the subdirectory is also renamed from cmdline_test to test-cmdline.

---
 MAINTAINERS                                                  | 2 +-
 app/Makefile                                                 | 1 +
 app/meson.build                                              | 4 +++-
 {test/cmdline_test => app/test-cmdline}/Makefile             | 0
 {test/cmdline_test => app/test-cmdline}/cmdline_test.c       | 0
 {test/cmdline_test => app/test-cmdline}/cmdline_test.h       | 0
 {test/cmdline_test => app/test-cmdline}/cmdline_test.py      | 0
 {test/cmdline_test => app/test-cmdline}/cmdline_test_data.py | 0
 {test/cmdline_test => app/test-cmdline}/commands.c           | 0
 app/test-cmdline/meson.build                                 | 5 +++++
 test/Makefile                                                | 1 -
 11 files changed, 10 insertions(+), 3 deletions(-)
 rename {test/cmdline_test => app/test-cmdline}/Makefile (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.c (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.h (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test.py (100%)
 rename {test/cmdline_test => app/test-cmdline}/cmdline_test_data.py (100%)
 rename {test/cmdline_test => app/test-cmdline}/commands.c (100%)
 create mode 100644 app/test-cmdline/meson.build
MAINTAINERS +1 -1
index 3b39bc65d..293bf6aa4 100644
@@ -1167,7 +1167,7 @@ F: test/test/test_cfgfiles/
 Interactive command line
 M: Olivier Matz <[email protected]>
 F: lib/librte_cmdline/
-F: test/cmdline_test/
+F: app/test-cmdline/
 F: test/test/test_cmdline*
 F: examples/cmdline/
 F: doc/guides/sample_app_ug/cmd_line.rst
app/Makefile +1 -0
index d6641ef1c..51237d0f4 100644
@@ -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_CMDLINE) += test-cmdline
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
app/meson.build +3 -1
index 47a2a8615..8bdf4f581 100644
@@ -1,9 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-apps = ['pdump',
+apps = [
+	'pdump',
 	'proc-info',
 	'test-bbdev',
+	'test-cmdline',
 	'test-compress-perf',
 	'test-crypto-perf',
 	'test-eventdev',
app/test-cmdline/Makefile renamed from test/cmdline_test/Makefile +0 -0
similarity index 100%
rename from test/cmdline_test/Makefile
rename to app/test-cmdline/Makefile
app/test-cmdline/cmdline_test.c renamed from test/cmdline_test/cmdline_test.c +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.c
rename to app/test-cmdline/cmdline_test.c
app/test-cmdline/cmdline_test.h renamed from test/cmdline_test/cmdline_test.h +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.h
rename to app/test-cmdline/cmdline_test.h
app/test-cmdline/cmdline_test.py renamed from test/cmdline_test/cmdline_test.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test.py
rename to app/test-cmdline/cmdline_test.py
app/test-cmdline/cmdline_test_data.py renamed from test/cmdline_test/cmdline_test_data.py +0 -0
similarity index 100%
rename from test/cmdline_test/cmdline_test_data.py
rename to app/test-cmdline/cmdline_test_data.py
app/test-cmdline/commands.c renamed from test/cmdline_test/commands.c +0 -0
similarity index 100%
rename from test/cmdline_test/commands.c
rename to app/test-cmdline/commands.c
app/test-cmdline/meson.build new file +5 -0
new file mode 100644
index 000000000..9d0a9aeb6
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('commands.c', 'cmdline_test.c')
+deps += 'cmdline'
test/Makefile +0 -1
index 6656374fc..4ffc087a0 100644
@@ -6,6 +6,5 @@ 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
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test
 
 include $(RTE_SDK)/mk/rte.subdir.mk
Signature · 1 line
2.20.1
#27 lore raw

PATCH v3 2/5 test/test-acl: move to app directory

In reply to Bruce Richardson

Move to "app" directory and enable with meson build.

CC Konstantin Ananyev <[email protected]>
---
 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
MAINTAINERS +1 -1
index 293bf6aa4..4f34c6e4c 100644
@@ -1106,7 +1106,7 @@ ACL
 M: Konstantin Ananyev <[email protected]>
 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
app/Makefile +1 -0
index 51237d0f4..234e3f504 100644
@@ -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)
app/meson.build +1 -0
index 8bdf4f581..3a34ebbf3 100644
@@ -4,6 +4,7 @@
 apps = [
 	'pdump',
 	'proc-info',
+	'test-acl',
 	'test-bbdev',
 	'test-cmdline',
 	'test-compress-perf',
app/test-acl/Makefile renamed from test/test-acl/Makefile +0 -0
similarity index 100%
rename from test/test-acl/Makefile
rename to app/test-acl/Makefile
app/test-acl/main.c renamed from test/test-acl/main.c +0 -0
similarity index 100%
rename from test/test-acl/main.c
rename to app/test-acl/main.c
app/test-acl/meson.build new file +5 -0
new file mode 100644
index 000000000..d5c2581b4
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('main.c')
+deps += ['acl', 'net']
test/Makefile +0 -1
index 4ffc087a0..0b7a3ed96 100644
@@ -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
Signature · 1 line
2.20.1
Acked-by on v3 2/5
#28 lore raw

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

Quoted 87 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, February 26, 2019 12:19 PM
To: [email protected]
Cc: [email protected]; Richardson, Bruce <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v3 2/5] test/test-acl: move to app directory

Move to "app" directory and enable with meson build.

CC Konstantin Ananyev <[email protected]>
---
 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
MAINTAINERS +1 -1
index 293bf6aa4..4f34c6e4c 100644
@@ -1106,7 +1106,7 @@ ACL
 M: Konstantin Ananyev <[email protected]>
 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
app/Makefile +1 -0
index 51237d0f4..234e3f504 100644
@@ -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)
app/meson.build +1 -0
index 8bdf4f581..3a34ebbf3 100644
@@ -4,6 +4,7 @@
 apps = [
 	'pdump',
 	'proc-info',
+	'test-acl',
 	'test-bbdev',
 	'test-cmdline',
 	'test-compress-perf',
app/test-acl/Makefile renamed from test/test-acl/Makefile +0 -0
similarity index 100%
rename from test/test-acl/Makefile
rename to app/test-acl/Makefile
app/test-acl/main.c renamed from test/test-acl/main.c +0 -0
similarity index 100%
rename from test/test-acl/main.c
rename to app/test-acl/main.c
app/test-acl/meson.build new file +5 -0
new file mode 100644
index 000000000..d5c2581b4
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+sources = files('main.c')
+deps += ['acl', 'net']
test/Makefile +0 -0
index 4ffc087a0..0b7a3ed96 100644

test/Makefile

Quoted 8 lines
test/Makefile +0 -2
@@ -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
--
Quoted 1 line

2.20.1

#29 lore raw

PATCH v3 3/5 test/test-pipeline: move to app directory

In reply to Bruce Richardson

Move to the app directory, and add to meson build.

CC Cristian Dumitrescu <[email protected]>
---
 MAINTAINERS                                     |  2 +-
 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
 doc/guides/sample_app_ug/test_pipeline.rst      |  2 +-
 test/Makefile                                   |  1 -
 17 files changed, 18 insertions(+), 3 deletions(-)
 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%)
MAINTAINERS +1 -1
index 4f34c6e4c..b690e1e83 100644
@@ -1093,7 +1093,7 @@ F: lib/librte_port/
 F: lib/librte_table/
 F: doc/guides/prog_guide/packet_framework.rst
 F: test/test/test_table*
-F: test/test-pipeline/
+F: app/test-pipeline/
 F: doc/guides/sample_app_ug/test_pipeline.rst
 F: examples/ip_pipeline/
 F: doc/guides/sample_app_ug/ip_pipeline.rst
app/Makefile +1 -0
index 234e3f504..eaf501633 100644
@@ -8,6 +8,7 @@ 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
+DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
app/meson.build +1 -0
index 3a34ebbf3..2360a3d45 100644
@@ -10,6 +10,7 @@ apps = [
 	'test-compress-perf',
 	'test-crypto-perf',
 	'test-eventdev',
+	'test-pipeline',
 	'test-pmd']
 
 # for BSD only
app/test-pipeline/Makefile renamed from test/test-pipeline/Makefile +0 -0
similarity index 100%
rename from test/test-pipeline/Makefile
rename to app/test-pipeline/Makefile
app/test-pipeline/config.c renamed from test/test-pipeline/config.c +0 -0
similarity index 100%
rename from test/test-pipeline/config.c
rename to app/test-pipeline/config.c
app/test-pipeline/init.c renamed from test/test-pipeline/init.c +0 -0
similarity index 100%
rename from test/test-pipeline/init.c
rename to app/test-pipeline/init.c
app/test-pipeline/main.c renamed from test/test-pipeline/main.c +0 -0
similarity index 100%
rename from test/test-pipeline/main.c
rename to app/test-pipeline/main.c
app/test-pipeline/main.h renamed from test/test-pipeline/main.h +0 -0
similarity index 100%
rename from test/test-pipeline/main.h
rename to app/test-pipeline/main.h
app/test-pipeline/meson.build new file +14 -0
new file mode 100644
index 000000000..5578b414d
@@ -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'
app/test-pipeline/pipeline_acl.c renamed from test/test-pipeline/pipeline_acl.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_acl.c
rename to app/test-pipeline/pipeline_acl.c
app/test-pipeline/pipeline_hash.c renamed from test/test-pipeline/pipeline_hash.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_hash.c
rename to app/test-pipeline/pipeline_hash.c
app/test-pipeline/pipeline_lpm.c renamed from test/test-pipeline/pipeline_lpm.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm.c
rename to app/test-pipeline/pipeline_lpm.c
app/test-pipeline/pipeline_lpm_ipv6.c renamed from test/test-pipeline/pipeline_lpm_ipv6.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_lpm_ipv6.c
rename to app/test-pipeline/pipeline_lpm_ipv6.c
app/test-pipeline/pipeline_stub.c renamed from test/test-pipeline/pipeline_stub.c +0 -0
similarity index 100%
rename from test/test-pipeline/pipeline_stub.c
rename to app/test-pipeline/pipeline_stub.c
app/test-pipeline/runtime.c renamed from test/test-pipeline/runtime.c +0 -0
similarity index 100%
rename from test/test-pipeline/runtime.c
rename to app/test-pipeline/runtime.c
doc/guides/sample_app_ug/test_pipeline.rst +1 -1
index a9370c80b..5f313c529 100644
@@ -32,7 +32,7 @@ Compiling the Application
 -------------------------
 To compile the sample application see :doc:`compiling`
 
-The application is located in the ``$RTE_SDK/test/test-pipline`` directory.
+The application is located in the ``$RTE_SDK/app/test-pipline`` directory.
 
 
 Running the Application
test/Makefile +0 -1
index 0b7a3ed96..e9ae64b59 100644
@@ -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
Signature · 1 line
2.20.1
#30 lore raw

PATCH v3 4/5 test/bpf: move to examples folder

In reply to Bruce Richardson

The bpf folder didn't actual contain a test application, but instead basic examples of BPF code for use with testpmd. Therefore we can move it to the examples folder. Being different, it also needs a README with it, explaining what it is and how to use it. References to the code from the testpmd docs are suitably updated.

---
 MAINTAINERS                                 | 2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 ++++----
 examples/bpf/README                         | 8 ++++++++
 {test => examples}/bpf/dummy.c              | 0
 {test => examples}/bpf/mbuf.h               | 0
 examples/bpf/meson.build                    | 6 ++++++
 {test => examples}/bpf/t1.c                 | 0
 {test => examples}/bpf/t2.c                 | 0
 {test => examples}/bpf/t3.c                 | 0
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 examples/bpf/README
 rename {test => examples}/bpf/dummy.c (100%)
 rename {test => examples}/bpf/mbuf.h (100%)
 create mode 100644 examples/bpf/meson.build
 rename {test => examples}/bpf/t1.c (100%)
 rename {test => examples}/bpf/t2.c (100%)
 rename {test => examples}/bpf/t3.c (100%)
MAINTAINERS +1 -1
index b690e1e83..e1c0f669b 100644
@@ -1229,7 +1229,7 @@ F: doc/guides/howto/telemetry.rst
 BPF - EXPERIMENTAL
 M: Konstantin Ananyev <[email protected]>
 F: lib/librte_bpf/
-F: test/bpf/
+F: examples/bpf/
 F: test/test/test_bpf.c
 F: doc/guides/prog_guide/bpf_lib.rst
 
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -4
index 5de9f1be1..1a12da4cf 100644
@@ -4503,20 +4503,20 @@ For example:
 
 .. code-block:: console
 
-   cd test/bpf
+   cd examples/bpf
    clang -O2 -target bpf -c t1.c
 
 Then to load (and JIT compile) t1.o at RX queue 0, port 1::
 
 .. code-block:: console
 
-   testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o
 
 To load (not JITed) t1.o at TX queue 0, port 0::
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-load tx 0 0 - ./dpdk.org/examples/bpf/t1.o
 
 bpf-unload
 ~~~~~~~~~~
@@ -4529,4 +4529,4 @@ For example to unload BPF filter from TX queue 0, port 0:
 
 .. code-block:: console
 
-   testpmd> bpf-load tx 0 0 - ./dpdk.org/test/bpf/t1.o
+   testpmd> bpf-unload tx 0 0
examples/bpf/README new file +8 -0
new file mode 100644
index 000000000..d714180a5
@@ -0,0 +1,8 @@
+This folder contains example BPF programs for use with the DPDK bpf
+library. To get details of each program and how to compile it, see
+the header on the '.c' file itself.
+
+Once compiled, these example programs can be loaded into `testpmd`
+for execution on a packet stream. See `bpf-load` and `bpf-unload`
+commands documented in the `Testpmd Application User Guide` for
+details on how to do so.
examples/bpf/dummy.c renamed from test/bpf/dummy.c +0 -0
similarity index 100%
rename from test/bpf/dummy.c
rename to examples/bpf/dummy.c
examples/bpf/mbuf.h renamed from test/bpf/mbuf.h +0 -0
similarity index 100%
rename from test/bpf/mbuf.h
rename to examples/bpf/mbuf.h
examples/bpf/meson.build new file +6 -0
new file mode 100644
index 000000000..0a817aaea
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Intel Corporation
+
+# This contains BPF example code for use in testing BPF with testpmd,
+# therefore it should not be built as part of a meson build.
+build=false
examples/bpf/t1.c renamed from test/bpf/t1.c +0 -0
similarity index 100%
rename from test/bpf/t1.c
rename to examples/bpf/t1.c
examples/bpf/t2.c renamed from test/bpf/t2.c +0 -0
similarity index 100%
rename from test/bpf/t2.c
rename to examples/bpf/t2.c
examples/bpf/t3.c renamed from test/bpf/t3.c +0 -0
similarity index 100%
rename from test/bpf/t3.c
rename to examples/bpf/t3.c
Signature · 1 line
2.20.1
#31 lore raw

PATCH v3 5/5 test/test: move to app folder

In reply to Bruce Richardson

Since all other apps have been moved to the "app" folder, the autotest app remains alone in the test folder. Rather than having an entire top-level folder for this, we can move it back to where it all started in early versions of DPDK - the "app/" folder.

This move has a couple of advantages:
* This reduces clutter at the top level of the project, due to one less folder.
* It eliminates the separate build task necessary for building the autotests using make "make test-build" which means that developers are less likely to miss something in their own compilation tests
* It re-aligns the final location of the test binary in the app folder when building with make with it's location in the source tree.

For meson builds, the autotest app is different from the other apps in that it needs a series of different test cases defined for it for use by "meson test". Therefore, it does not get built as part of the main loop in the app folder, but gets built separately at the end.

---
 GNUmakefile                                   |   1 -
 MAINTAINERS                                   | 182 +++++++++---------
 app/Makefile                                  |   1 +
 app/meson.build                               |   3 +
 {test => app}/test/Makefile                   |   0
 {test => app}/test/autotest.py                |   0
 {test => app}/test/autotest_data.py           |   0
 {test => app}/test/autotest_runner.py         |   0
 {test => app}/test/autotest_test_funcs.py     |   0
 {test => app}/test/commands.c                 |   0
 {test => app}/test/meson.build                |   0
 {test => app}/test/packet_burst_generator.c   |   0
 {test => app}/test/packet_burst_generator.h   |   0
 {test => app}/test/process.h                  |   0
 {test => app}/test/resource.c                 |   0
 {test => app}/test/resource.h                 |   0
 {test => app}/test/sample_packet_forward.c    |   0
 {test => app}/test/sample_packet_forward.h    |   0
 {test => app}/test/test.c                     |   0
 {test => app}/test/test.h                     |   0
 {test => app}/test/test_acl.c                 |   0
 {test => app}/test/test_acl.h                 |   0
 {test => app}/test/test_alarm.c               |   0
 {test => app}/test/test_atomic.c              |   0
 {test => app}/test/test_barrier.c             |   0
 {test => app}/test/test_bitmap.c              |   0
 {test => app}/test/test_bitratestats.c        |   0
 {test => app}/test/test_bpf.c                 |   0
 {test => app}/test/test_byteorder.c           |   0
 {test => app}/test/test_cfgfile.c             |   0
 .../test/test_cfgfiles/etc/empty.ini          |   0
 .../test_cfgfiles/etc/empty_key_value.ini     |   0
 .../test_cfgfiles/etc/invalid_section.ini     |   0
 .../test/test_cfgfiles/etc/line_too_long.ini  |   0
 .../test_cfgfiles/etc/missing_section.ini     |   0
 .../test_cfgfiles/etc/realloc_sections.ini    |   0
 .../test/test_cfgfiles/etc/sample1.ini        |   0
 .../test/test_cfgfiles/etc/sample2.ini        |   0
 {test => app}/test/test_cmdline.c             |   0
 {test => app}/test/test_cmdline.h             |   0
 {test => app}/test/test_cmdline_cirbuf.c      |   0
 {test => app}/test/test_cmdline_etheraddr.c   |   0
 {test => app}/test/test_cmdline_ipaddr.c      |   0
 {test => app}/test/test_cmdline_lib.c         |   0
 {test => app}/test/test_cmdline_num.c         |   0
 {test => app}/test/test_cmdline_portlist.c    |   0
 {test => app}/test/test_cmdline_string.c      |   0
 {test => app}/test/test_common.c              |   0
 {test => app}/test/test_compressdev.c         |   0
 .../test/test_compressdev_test_buffer.h       |   0
 {test => app}/test/test_cpuflags.c            |   0
 {test => app}/test/test_crc.c                 |   0
 {test => app}/test/test_cryptodev.c           |   0
 {test => app}/test/test_cryptodev.h           |   0
 .../test/test_cryptodev_aead_test_vectors.h   |   0
 .../test/test_cryptodev_aes_test_vectors.h    |   0
 {test => app}/test/test_cryptodev_asym.c      |   0
 {test => app}/test/test_cryptodev_asym_util.h |   0
 .../test/test_cryptodev_blockcipher.c         |   0
 .../test/test_cryptodev_blockcipher.h         |   0
 .../test/test_cryptodev_des_test_vectors.h    |   0
 .../test/test_cryptodev_dh_test_vectors.h     |   0
 .../test/test_cryptodev_dsa_test_vectors.h    |   0
 .../test/test_cryptodev_hash_test_vectors.h   |   0
 .../test/test_cryptodev_hmac_test_vectors.h   |   0
 .../test_cryptodev_kasumi_hash_test_vectors.h |   0
 .../test/test_cryptodev_kasumi_test_vectors.h |   0
 .../test/test_cryptodev_mod_test_vectors.h    |   0
 .../test/test_cryptodev_rsa_test_vectors.h    |   0
 .../test_cryptodev_snow3g_hash_test_vectors.h |   0
 .../test/test_cryptodev_snow3g_test_vectors.h |   0
 .../test/test_cryptodev_zuc_test_vectors.h    |   0
 {test => app}/test/test_cycles.c              |   0
 {test => app}/test/test_debug.c               |   0
 {test => app}/test/test_distributor.c         |   0
 {test => app}/test/test_distributor_perf.c    |   0
 {test => app}/test/test_eal_flags.c           |   0
 {test => app}/test/test_eal_fs.c              |   0
 {test => app}/test/test_efd.c                 |   0
 {test => app}/test/test_efd_perf.c            |   0
 {test => app}/test/test_errno.c               |   0
 .../test/test_event_crypto_adapter.c          |   0
 .../test/test_event_eth_rx_adapter.c          |   0
 .../test/test_event_eth_tx_adapter.c          |   0
 {test => app}/test/test_event_ring.c          |   0
 {test => app}/test/test_event_timer_adapter.c |   0
 {test => app}/test/test_eventdev.c            |   0
 {test => app}/test/test_external_mem.c        |   0
 {test => app}/test/test_fbarray.c             |   0
 {test => app}/test/test_flow_classify.c       |   0
 {test => app}/test/test_flow_classify.h       |   0
 {test => app}/test/test_func_reentrancy.c     |   0
 {test => app}/test/test_hash.c                |   0
 {test => app}/test/test_hash_functions.c      |   0
 {test => app}/test/test_hash_multiwriter.c    |   0
 {test => app}/test/test_hash_perf.c           |   0
 {test => app}/test/test_hash_readwrite.c      |   0
 {test => app}/test/test_hash_readwrite_lf.c   |   0
 {test => app}/test/test_interrupts.c          |   0
 {test => app}/test/test_ipsec.c               |   0
 {test => app}/test/test_kni.c                 |   0
 {test => app}/test/test_kvargs.c              |   0
 {test => app}/test/test_latencystats.c        |   0
 {test => app}/test/test_link_bonding.c        |   0
 {test => app}/test/test_link_bonding_mode4.c  |   0
 .../test/test_link_bonding_rssconf.c          |   0
 {test => app}/test/test_logs.c                |   0
 {test => app}/test/test_lpm.c                 |   0
 {test => app}/test/test_lpm6.c                |   0
 {test => app}/test/test_lpm6_data.h           |   0
 {test => app}/test/test_lpm6_perf.c           |   0
 {test => app}/test/test_lpm_perf.c            |   0
 {test => app}/test/test_malloc.c              |   0
 {test => app}/test/test_mbuf.c                |   0
 {test => app}/test/test_member.c              |   0
 {test => app}/test/test_member_perf.c         |   0
 {test => app}/test/test_memcpy.c              |   0
 {test => app}/test/test_memcpy_perf.c         |   0
 {test => app}/test/test_memory.c              |   0
 {test => app}/test/test_mempool.c             |   0
 {test => app}/test/test_mempool_perf.c        |   0
 {test => app}/test/test_memzone.c             |   0
 {test => app}/test/test_meter.c               |   0
 {test => app}/test/test_metrics.c             |   0
 {test => app}/test/test_mp_secondary.c        |   0
 {test => app}/test/test_pdump.c               |   0
 {test => app}/test/test_pdump.h               |   0
 {test => app}/test/test_per_lcore.c           |   0
 {test => app}/test/test_pmd_perf.c            |   0
 {test => app}/test/test_pmd_ring.c            |   0
 {test => app}/test/test_pmd_ring_perf.c       |   0
 {test => app}/test/test_power.c               |   0
 {test => app}/test/test_power_acpi_cpufreq.c  |   0
 {test => app}/test/test_power_kvm_vm.c        |   0
 {test => app}/test/test_prefetch.c            |   0
 {test => app}/test/test_rawdev.c              |   0
 {test => app}/test/test_reciprocal_division.c |   0
 .../test/test_reciprocal_division_perf.c      |   0
 {test => app}/test/test_red.c                 |   0
 {test => app}/test/test_reorder.c             |   0
 {test => app}/test/test_resource.c            |   0
 {test => app}/test/test_ring.c                |   0
 {test => app}/test/test_ring_perf.c           |   0
 {test => app}/test/test_rwlock.c              |   0
 {test => app}/test/test_sched.c               |   0
 {test => app}/test/test_service_cores.c       |   0
 {test => app}/test/test_spinlock.c            |   0
 {test => app}/test/test_string_fns.c          |   0
 {test => app}/test/test_table.c               |   0
 {test => app}/test/test_table.h               |   0
 {test => app}/test/test_table_acl.c           |   0
 {test => app}/test/test_table_acl.h           |   0
 {test => app}/test/test_table_combined.c      |   0
 {test => app}/test/test_table_combined.h      |   0
 {test => app}/test/test_table_pipeline.c      |   0
 {test => app}/test/test_table_pipeline.h      |   0
 {test => app}/test/test_table_ports.c         |   0
 {test => app}/test/test_table_ports.h         |   0
 {test => app}/test/test_table_tables.c        |   0
 {test => app}/test/test_table_tables.h        |   0
 {test => app}/test/test_tailq.c               |   0
 {test => app}/test/test_thash.c               |   0
 {test => app}/test/test_timer.c               |   0
 {test => app}/test/test_timer_perf.c          |   0
 {test => app}/test/test_timer_racecond.c      |   0
 {test => app}/test/test_version.c             |   0
 {test => app}/test/test_xmmt_ops.h            |   0
 {test => app}/test/virtual_pmd.c              |   0
 {test => app}/test/virtual_pmd.h              |   0
 devtools/test-build.sh                        |   3 -
 doc/guides/compressdevs/octeontx.rst          |   2 +-
 doc/guides/cryptodevs/qat.rst                 |   4 +-
 doc/guides/cryptodevs/virtio.rst              |   2 +-
 doc/guides/mempool/octeontx.rst               |   2 +-
 doc/guides/prog_guide/compressdev.rst         |   2 +-
 meson.build                                   |   1 -
 mk/rte.sdkbuild.mk                            |   3 -
 mk/rte.sdkroot.mk                             |   6 +-
 mk/rte.sdktest.mk                             |   8 +-
 test/Makefile                                 |   8 -
 test/meson.build                              |   4 -
 181 files changed, 107 insertions(+), 125 deletions(-)
 rename {test => app}/test/Makefile (100%)
 rename {test => app}/test/autotest.py (100%)
 rename {test => app}/test/autotest_data.py (100%)
 rename {test => app}/test/autotest_runner.py (100%)
 rename {test => app}/test/autotest_test_funcs.py (100%)
 rename {test => app}/test/commands.c (100%)
 rename {test => app}/test/meson.build (100%)
 rename {test => app}/test/packet_burst_generator.c (100%)
 rename {test => app}/test/packet_burst_generator.h (100%)
 rename {test => app}/test/process.h (100%)
 rename {test => app}/test/resource.c (100%)
 rename {test => app}/test/resource.h (100%)
 rename {test => app}/test/sample_packet_forward.c (100%)
 rename {test => app}/test/sample_packet_forward.h (100%)
 rename {test => app}/test/test.c (100%)
 rename {test => app}/test/test.h (100%)
 rename {test => app}/test/test_acl.c (100%)
 rename {test => app}/test/test_acl.h (100%)
 rename {test => app}/test/test_alarm.c (100%)
 rename {test => app}/test/test_atomic.c (100%)
 rename {test => app}/test/test_barrier.c (100%)
 rename {test => app}/test/test_bitmap.c (100%)
 rename {test => app}/test/test_bitratestats.c (100%)
 rename {test => app}/test/test_bpf.c (100%)
 rename {test => app}/test/test_byteorder.c (100%)
 rename {test => app}/test/test_cfgfile.c (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/empty_key_value.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/invalid_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/line_too_long.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/missing_section.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/realloc_sections.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample1.ini (100%)
 rename {test => app}/test/test_cfgfiles/etc/sample2.ini (100%)
 rename {test => app}/test/test_cmdline.c (100%)
 rename {test => app}/test/test_cmdline.h (100%)
 rename {test => app}/test/test_cmdline_cirbuf.c (100%)
 rename {test => app}/test/test_cmdline_etheraddr.c (100%)
 rename {test => app}/test/test_cmdline_ipaddr.c (100%)
 rename {test => app}/test/test_cmdline_lib.c (100%)
 rename {test => app}/test/test_cmdline_num.c (100%)
 rename {test => app}/test/test_cmdline_portlist.c (100%)
 rename {test => app}/test/test_cmdline_string.c (100%)
 rename {test => app}/test/test_common.c (100%)
 rename {test => app}/test/test_compressdev.c (100%)
 rename {test => app}/test/test_compressdev_test_buffer.h (100%)
 rename {test => app}/test/test_cpuflags.c (100%)
 rename {test => app}/test/test_crc.c (100%)
 rename {test => app}/test/test_cryptodev.c (100%)
 rename {test => app}/test/test_cryptodev.h (100%)
 rename {test => app}/test/test_cryptodev_aead_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_aes_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_asym.c (100%)
 rename {test => app}/test/test_cryptodev_asym_util.h (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.c (100%)
 rename {test => app}/test/test_cryptodev_blockcipher.h (100%)
 rename {test => app}/test/test_cryptodev_des_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dh_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_dsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_hmac_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_kasumi_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_mod_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_rsa_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_hash_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_snow3g_test_vectors.h (100%)
 rename {test => app}/test/test_cryptodev_zuc_test_vectors.h (100%)
 rename {test => app}/test/test_cycles.c (100%)
 rename {test => app}/test/test_debug.c (100%)
 rename {test => app}/test/test_distributor.c (100%)
 rename {test => app}/test/test_distributor_perf.c (100%)
 rename {test => app}/test/test_eal_flags.c (100%)
 rename {test => app}/test/test_eal_fs.c (100%)
 rename {test => app}/test/test_efd.c (100%)
 rename {test => app}/test/test_efd_perf.c (100%)
 rename {test => app}/test/test_errno.c (100%)
 rename {test => app}/test/test_event_crypto_adapter.c (100%)
 rename {test => app}/test/test_event_eth_rx_adapter.c (100%)
 rename {test => app}/test/test_event_eth_tx_adapter.c (100%)
 rename {test => app}/test/test_event_ring.c (100%)
 rename {test => app}/test/test_event_timer_adapter.c (100%)
 rename {test => app}/test/test_eventdev.c (100%)
 rename {test => app}/test/test_external_mem.c (100%)
 rename {test => app}/test/test_fbarray.c (100%)
 rename {test => app}/test/test_flow_classify.c (100%)
 rename {test => app}/test/test_flow_classify.h (100%)
 rename {test => app}/test/test_func_reentrancy.c (100%)
 rename {test => app}/test/test_hash.c (100%)
 rename {test => app}/test/test_hash_functions.c (100%)
 rename {test => app}/test/test_hash_multiwriter.c (100%)
 rename {test => app}/test/test_hash_perf.c (100%)
 rename {test => app}/test/test_hash_readwrite.c (100%)
 rename {test => app}/test/test_hash_readwrite_lf.c (100%)
 rename {test => app}/test/test_interrupts.c (100%)
 rename {test => app}/test/test_ipsec.c (100%)
 rename {test => app}/test/test_kni.c (100%)
 rename {test => app}/test/test_kvargs.c (100%)
 rename {test => app}/test/test_latencystats.c (100%)
 rename {test => app}/test/test_link_bonding.c (100%)
 rename {test => app}/test/test_link_bonding_mode4.c (100%)
 rename {test => app}/test/test_link_bonding_rssconf.c (100%)
 rename {test => app}/test/test_logs.c (100%)
 rename {test => app}/test/test_lpm.c (100%)
 rename {test => app}/test/test_lpm6.c (100%)
 rename {test => app}/test/test_lpm6_data.h (100%)
 rename {test => app}/test/test_lpm6_perf.c (100%)
 rename {test => app}/test/test_lpm_perf.c (100%)
 rename {test => app}/test/test_malloc.c (100%)
 rename {test => app}/test/test_mbuf.c (100%)
 rename {test => app}/test/test_member.c (100%)
 rename {test => app}/test/test_member_perf.c (100%)
 rename {test => app}/test/test_memcpy.c (100%)
 rename {test => app}/test/test_memcpy_perf.c (100%)
 rename {test => app}/test/test_memory.c (100%)
 rename {test => app}/test/test_mempool.c (100%)
 rename {test => app}/test/test_mempool_perf.c (100%)
 rename {test => app}/test/test_memzone.c (100%)
 rename {test => app}/test/test_meter.c (100%)
 rename {test => app}/test/test_metrics.c (100%)
 rename {test => app}/test/test_mp_secondary.c (100%)
 rename {test => app}/test/test_pdump.c (100%)
 rename {test => app}/test/test_pdump.h (100%)
 rename {test => app}/test/test_per_lcore.c (100%)
 rename {test => app}/test/test_pmd_perf.c (100%)
 rename {test => app}/test/test_pmd_ring.c (100%)
 rename {test => app}/test/test_pmd_ring_perf.c (100%)
 rename {test => app}/test/test_power.c (100%)
 rename {test => app}/test/test_power_acpi_cpufreq.c (100%)
 rename {test => app}/test/test_power_kvm_vm.c (100%)
 rename {test => app}/test/test_prefetch.c (100%)
 rename {test => app}/test/test_rawdev.c (100%)
 rename {test => app}/test/test_reciprocal_division.c (100%)
 rename {test => app}/test/test_reciprocal_division_perf.c (100%)
 rename {test => app}/test/test_red.c (100%)
 rename {test => app}/test/test_reorder.c (100%)
 rename {test => app}/test/test_resource.c (100%)
 rename {test => app}/test/test_ring.c (100%)
 rename {test => app}/test/test_ring_perf.c (100%)
 rename {test => app}/test/test_rwlock.c (100%)
 rename {test => app}/test/test_sched.c (100%)
 rename {test => app}/test/test_service_cores.c (100%)
 rename {test => app}/test/test_spinlock.c (100%)
 rename {test => app}/test/test_string_fns.c (100%)
 rename {test => app}/test/test_table.c (100%)
 rename {test => app}/test/test_table.h (100%)
 rename {test => app}/test/test_table_acl.c (100%)
 rename {test => app}/test/test_table_acl.h (100%)
 rename {test => app}/test/test_table_combined.c (100%)
 rename {test => app}/test/test_table_combined.h (100%)
 rename {test => app}/test/test_table_pipeline.c (100%)
 rename {test => app}/test/test_table_pipeline.h (100%)
 rename {test => app}/test/test_table_ports.c (100%)
 rename {test => app}/test/test_table_ports.h (100%)
 rename {test => app}/test/test_table_tables.c (100%)
 rename {test => app}/test/test_table_tables.h (100%)
 rename {test => app}/test/test_tailq.c (100%)
 rename {test => app}/test/test_thash.c (100%)
 rename {test => app}/test/test_timer.c (100%)
 rename {test => app}/test/test_timer_perf.c (100%)
 rename {test => app}/test/test_timer_racecond.c (100%)
 rename {test => app}/test/test_version.c (100%)
 rename {test => app}/test/test_xmmt_ops.h (100%)
 rename {test => app}/test/virtual_pmd.c (100%)
 rename {test => app}/test/virtual_pmd.h (100%)
 delete mode 100644 test/Makefile
 delete mode 100644 test/meson.build
GNUmakefile +0 -1
index ae80720e9..e8de422df 100644
@@ -13,6 +13,5 @@ export RTE_SDK
 #
 
 ROOTDIRS-y := buildtools lib kernel drivers app
-ROOTDIRS-  := test
 
 include $(RTE_SDK)/mk/rte.sdkroot.mk
MAINTAINERS +91 -91

437 lines not on this page · raw message

app/Makefile +1 -0
index eaf501633..28acbceca 100644
@@ -3,6 +3,7 @@
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
+DIRS-$(CONFIG_RTE_APP_TEST) += test
 DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd
 DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info
 DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
app/meson.build +3 -0
index 2360a3d45..aa353f657 100644
@@ -65,3 +65,6 @@ foreach app:apps
 				install: true)
 	endif
 endforeach
+
+# special case the autotests
+subdir('test')
app/test/Makefile renamed from test/test/Makefile +0 -0
similarity index 100%
rename from test/test/Makefile
rename to app/test/Makefile
app/test/autotest.py renamed from test/test/autotest.py +0 -0
similarity index 100%
rename from test/test/autotest.py
rename to app/test/autotest.py
app/test/autotest_data.py renamed from test/test/autotest_data.py +0 -0
similarity index 100%
rename from test/test/autotest_data.py
rename to app/test/autotest_data.py
app/test/autotest_runner.py renamed from test/test/autotest_runner.py +0 -0
similarity index 100%
rename from test/test/autotest_runner.py
rename to app/test/autotest_runner.py
app/test/autotest_test_funcs.py renamed from test/test/autotest_test_funcs.py +0 -0
similarity index 100%
rename from test/test/autotest_test_funcs.py
rename to app/test/autotest_test_funcs.py
app/test/commands.c renamed from test/test/commands.c +0 -0
similarity index 100%
rename from test/test/commands.c
rename to app/test/commands.c
app/test/meson.build renamed from test/test/meson.build +0 -0
similarity index 100%
rename from test/test/meson.build
rename to app/test/meson.build
app/test/packet_burst_generator.c renamed from test/test/packet_burst_generator.c +0 -0
similarity index 100%
rename from test/test/packet_burst_generator.c
rename to app/test/packet_burst_generator.c
app/test/packet_burst_generator.h renamed from test/test/packet_burst_generator.h +0 -0
similarity index 100%
rename from test/test/packet_burst_generator.h
rename to app/test/packet_burst_generator.h
app/test/process.h renamed from test/test/process.h +0 -0
similarity index 100%
rename from test/test/process.h
rename to app/test/process.h
app/test/resource.c renamed from test/test/resource.c +0 -0
similarity index 100%
rename from test/test/resource.c
rename to app/test/resource.c
app/test/resource.h renamed from test/test/resource.h +0 -0
similarity index 100%
rename from test/test/resource.h
rename to app/test/resource.h
app/test/sample_packet_forward.c renamed from test/test/sample_packet_forward.c +0 -0
similarity index 100%
rename from test/test/sample_packet_forward.c
rename to app/test/sample_packet_forward.c
app/test/sample_packet_forward.h renamed from test/test/sample_packet_forward.h +0 -0
similarity index 100%
rename from test/test/sample_packet_forward.h
rename to app/test/sample_packet_forward.h
app/test/test.c renamed from test/test/test.c +0 -0
similarity index 100%
rename from test/test/test.c
rename to app/test/test.c
app/test/test.h renamed from test/test/test.h +0 -0
similarity index 100%
rename from test/test/test.h
rename to app/test/test.h
app/test/test_acl.c renamed from test/test/test_acl.c +0 -0
similarity index 100%
rename from test/test/test_acl.c
rename to app/test/test_acl.c
app/test/test_acl.h renamed from test/test/test_acl.h +0 -0
similarity index 100%
rename from test/test/test_acl.h
rename to app/test/test_acl.h
app/test/test_alarm.c renamed from test/test/test_alarm.c +0 -0
similarity index 100%
rename from test/test/test_alarm.c
rename to app/test/test_alarm.c
app/test/test_atomic.c renamed from test/test/test_atomic.c +0 -0
similarity index 100%
rename from test/test/test_atomic.c
rename to app/test/test_atomic.c
app/test/test_barrier.c renamed from test/test/test_barrier.c +0 -0
similarity index 100%
rename from test/test/test_barrier.c
rename to app/test/test_barrier.c
app/test/test_bitmap.c renamed from test/test/test_bitmap.c +0 -0
similarity index 100%
rename from test/test/test_bitmap.c
rename to app/test/test_bitmap.c
app/test/test_bitratestats.c renamed from test/test/test_bitratestats.c +0 -0
similarity index 100%
rename from test/test/test_bitratestats.c
rename to app/test/test_bitratestats.c
app/test/test_bpf.c renamed from test/test/test_bpf.c +0 -0
similarity index 100%
rename from test/test/test_bpf.c
rename to app/test/test_bpf.c
app/test/test_byteorder.c renamed from test/test/test_byteorder.c +0 -0
similarity index 100%
rename from test/test/test_byteorder.c
rename to app/test/test_byteorder.c
app/test/test_cfgfile.c renamed from test/test/test_cfgfile.c +0 -0
similarity index 100%
rename from test/test/test_cfgfile.c
rename to app/test/test_cfgfile.c
app/test/test_cfgfiles/etc/empty.ini renamed from test/test/test_cfgfiles/etc/empty.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/empty.ini
rename to app/test/test_cfgfiles/etc/empty.ini
app/test/test_cfgfiles/etc/empty_key_value.ini renamed from test/test/test_cfgfiles/etc/empty_key_value.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/empty_key_value.ini
rename to app/test/test_cfgfiles/etc/empty_key_value.ini
app/test/test_cfgfiles/etc/invalid_section.ini renamed from test/test/test_cfgfiles/etc/invalid_section.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/invalid_section.ini
rename to app/test/test_cfgfiles/etc/invalid_section.ini
app/test/test_cfgfiles/etc/line_too_long.ini renamed from test/test/test_cfgfiles/etc/line_too_long.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/line_too_long.ini
rename to app/test/test_cfgfiles/etc/line_too_long.ini
app/test/test_cfgfiles/etc/missing_section.ini renamed from test/test/test_cfgfiles/etc/missing_section.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/missing_section.ini
rename to app/test/test_cfgfiles/etc/missing_section.ini
app/test/test_cfgfiles/etc/realloc_sections.ini renamed from test/test/test_cfgfiles/etc/realloc_sections.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/realloc_sections.ini
rename to app/test/test_cfgfiles/etc/realloc_sections.ini
app/test/test_cfgfiles/etc/sample1.ini renamed from test/test/test_cfgfiles/etc/sample1.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/sample1.ini
rename to app/test/test_cfgfiles/etc/sample1.ini
app/test/test_cfgfiles/etc/sample2.ini renamed from test/test/test_cfgfiles/etc/sample2.ini +0 -0
similarity index 100%
rename from test/test/test_cfgfiles/etc/sample2.ini
rename to app/test/test_cfgfiles/etc/sample2.ini
app/test/test_cmdline.c renamed from test/test/test_cmdline.c +0 -0
similarity index 100%
rename from test/test/test_cmdline.c
rename to app/test/test_cmdline.c
app/test/test_cmdline.h renamed from test/test/test_cmdline.h +0 -0
similarity index 100%
rename from test/test/test_cmdline.h
rename to app/test/test_cmdline.h
app/test/test_cmdline_cirbuf.c renamed from test/test/test_cmdline_cirbuf.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_cirbuf.c
rename to app/test/test_cmdline_cirbuf.c
app/test/test_cmdline_etheraddr.c renamed from test/test/test_cmdline_etheraddr.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_etheraddr.c
rename to app/test/test_cmdline_etheraddr.c
app/test/test_cmdline_ipaddr.c renamed from test/test/test_cmdline_ipaddr.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_ipaddr.c
rename to app/test/test_cmdline_ipaddr.c
app/test/test_cmdline_lib.c renamed from test/test/test_cmdline_lib.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_lib.c
rename to app/test/test_cmdline_lib.c
app/test/test_cmdline_num.c renamed from test/test/test_cmdline_num.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_num.c
rename to app/test/test_cmdline_num.c
app/test/test_cmdline_portlist.c renamed from test/test/test_cmdline_portlist.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_portlist.c
rename to app/test/test_cmdline_portlist.c
app/test/test_cmdline_string.c renamed from test/test/test_cmdline_string.c +0 -0
similarity index 100%
rename from test/test/test_cmdline_string.c
rename to app/test/test_cmdline_string.c
app/test/test_common.c renamed from test/test/test_common.c +0 -0
similarity index 100%
rename from test/test/test_common.c
rename to app/test/test_common.c
app/test/test_compressdev.c renamed from test/test/test_compressdev.c +0 -0
similarity index 100%
rename from test/test/test_compressdev.c
rename to app/test/test_compressdev.c
app/test/test_compressdev_test_buffer.h renamed from test/test/test_compressdev_test_buffer.h +0 -0
similarity index 100%
rename from test/test/test_compressdev_test_buffer.h
rename to app/test/test_compressdev_test_buffer.h
app/test/test_cpuflags.c renamed from test/test/test_cpuflags.c +0 -0
similarity index 100%
rename from test/test/test_cpuflags.c
rename to app/test/test_cpuflags.c
app/test/test_crc.c renamed from test/test/test_crc.c +0 -0
similarity index 100%
rename from test/test/test_crc.c
rename to app/test/test_crc.c
app/test/test_cryptodev.c renamed from test/test/test_cryptodev.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev.c
rename to app/test/test_cryptodev.c
app/test/test_cryptodev.h renamed from test/test/test_cryptodev.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev.h
rename to app/test/test_cryptodev.h
app/test/test_cryptodev_aead_test_vectors.h renamed from test/test/test_cryptodev_aead_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_aead_test_vectors.h
rename to app/test/test_cryptodev_aead_test_vectors.h
app/test/test_cryptodev_aes_test_vectors.h renamed from test/test/test_cryptodev_aes_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_aes_test_vectors.h
rename to app/test/test_cryptodev_aes_test_vectors.h
app/test/test_cryptodev_asym.c renamed from test/test/test_cryptodev_asym.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev_asym.c
rename to app/test/test_cryptodev_asym.c
app/test/test_cryptodev_asym_util.h renamed from test/test/test_cryptodev_asym_util.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_asym_util.h
rename to app/test/test_cryptodev_asym_util.h
app/test/test_cryptodev_blockcipher.c renamed from test/test/test_cryptodev_blockcipher.c +0 -0
similarity index 100%
rename from test/test/test_cryptodev_blockcipher.c
rename to app/test/test_cryptodev_blockcipher.c
app/test/test_cryptodev_blockcipher.h renamed from test/test/test_cryptodev_blockcipher.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_blockcipher.h
rename to app/test/test_cryptodev_blockcipher.h
app/test/test_cryptodev_des_test_vectors.h renamed from test/test/test_cryptodev_des_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_des_test_vectors.h
rename to app/test/test_cryptodev_des_test_vectors.h
app/test/test_cryptodev_dh_test_vectors.h renamed from test/test/test_cryptodev_dh_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_dh_test_vectors.h
rename to app/test/test_cryptodev_dh_test_vectors.h
app/test/test_cryptodev_dsa_test_vectors.h renamed from test/test/test_cryptodev_dsa_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_dsa_test_vectors.h
rename to app/test/test_cryptodev_dsa_test_vectors.h
app/test/test_cryptodev_hash_test_vectors.h renamed from test/test/test_cryptodev_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_hash_test_vectors.h
rename to app/test/test_cryptodev_hash_test_vectors.h
app/test/test_cryptodev_hmac_test_vectors.h renamed from test/test/test_cryptodev_hmac_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_hmac_test_vectors.h
rename to app/test/test_cryptodev_hmac_test_vectors.h
app/test/test_cryptodev_kasumi_hash_test_vectors.h renamed from test/test/test_cryptodev_kasumi_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_kasumi_hash_test_vectors.h
rename to app/test/test_cryptodev_kasumi_hash_test_vectors.h
app/test/test_cryptodev_kasumi_test_vectors.h renamed from test/test/test_cryptodev_kasumi_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_kasumi_test_vectors.h
rename to app/test/test_cryptodev_kasumi_test_vectors.h
app/test/test_cryptodev_mod_test_vectors.h renamed from test/test/test_cryptodev_mod_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_mod_test_vectors.h
rename to app/test/test_cryptodev_mod_test_vectors.h
app/test/test_cryptodev_rsa_test_vectors.h renamed from test/test/test_cryptodev_rsa_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_rsa_test_vectors.h
rename to app/test/test_cryptodev_rsa_test_vectors.h
app/test/test_cryptodev_snow3g_hash_test_vectors.h renamed from test/test/test_cryptodev_snow3g_hash_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_snow3g_hash_test_vectors.h
rename to app/test/test_cryptodev_snow3g_hash_test_vectors.h
app/test/test_cryptodev_snow3g_test_vectors.h renamed from test/test/test_cryptodev_snow3g_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_snow3g_test_vectors.h
rename to app/test/test_cryptodev_snow3g_test_vectors.h
app/test/test_cryptodev_zuc_test_vectors.h renamed from test/test/test_cryptodev_zuc_test_vectors.h +0 -0
similarity index 100%
rename from test/test/test_cryptodev_zuc_test_vectors.h
rename to app/test/test_cryptodev_zuc_test_vectors.h
app/test/test_cycles.c renamed from test/test/test_cycles.c +0 -0
similarity index 100%
rename from test/test/test_cycles.c
rename to app/test/test_cycles.c
app/test/test_debug.c renamed from test/test/test_debug.c +0 -0
similarity index 100%
rename from test/test/test_debug.c
rename to app/test/test_debug.c
app/test/test_distributor.c renamed from test/test/test_distributor.c +0 -0
similarity index 100%
rename from test/test/test_distributor.c
rename to app/test/test_distributor.c
app/test/test_distributor_perf.c renamed from test/test/test_distributor_perf.c +0 -0
similarity index 100%
rename from test/test/test_distributor_perf.c
rename to app/test/test_distributor_perf.c
app/test/test_eal_flags.c renamed from test/test/test_eal_flags.c +0 -0
similarity index 100%
rename from test/test/test_eal_flags.c
rename to app/test/test_eal_flags.c
app/test/test_eal_fs.c renamed from test/test/test_eal_fs.c +0 -0
similarity index 100%
rename from test/test/test_eal_fs.c
rename to app/test/test_eal_fs.c
app/test/test_efd.c renamed from test/test/test_efd.c +0 -0
similarity index 100%
rename from test/test/test_efd.c
rename to app/test/test_efd.c
app/test/test_efd_perf.c renamed from test/test/test_efd_perf.c +0 -0
similarity index 100%
rename from test/test/test_efd_perf.c
rename to app/test/test_efd_perf.c
app/test/test_errno.c renamed from test/test/test_errno.c +0 -0
similarity index 100%
rename from test/test/test_errno.c
rename to app/test/test_errno.c
app/test/test_event_crypto_adapter.c renamed from test/test/test_event_crypto_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_crypto_adapter.c
rename to app/test/test_event_crypto_adapter.c
app/test/test_event_eth_rx_adapter.c renamed from test/test/test_event_eth_rx_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_eth_rx_adapter.c
rename to app/test/test_event_eth_rx_adapter.c
app/test/test_event_eth_tx_adapter.c renamed from test/test/test_event_eth_tx_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_eth_tx_adapter.c
rename to app/test/test_event_eth_tx_adapter.c
app/test/test_event_ring.c renamed from test/test/test_event_ring.c +0 -0
similarity index 100%
rename from test/test/test_event_ring.c
rename to app/test/test_event_ring.c
app/test/test_event_timer_adapter.c renamed from test/test/test_event_timer_adapter.c +0 -0
similarity index 100%
rename from test/test/test_event_timer_adapter.c
rename to app/test/test_event_timer_adapter.c
app/test/test_eventdev.c renamed from test/test/test_eventdev.c +0 -0
similarity index 100%
rename from test/test/test_eventdev.c
rename to app/test/test_eventdev.c
app/test/test_external_mem.c renamed from test/test/test_external_mem.c +0 -0
similarity index 100%
rename from test/test/test_external_mem.c
rename to app/test/test_external_mem.c
app/test/test_fbarray.c renamed from test/test/test_fbarray.c +0 -0
similarity index 100%
rename from test/test/test_fbarray.c
rename to app/test/test_fbarray.c
app/test/test_flow_classify.c renamed from test/test/test_flow_classify.c +0 -0
similarity index 100%
rename from test/test/test_flow_classify.c
rename to app/test/test_flow_classify.c
app/test/test_flow_classify.h renamed from test/test/test_flow_classify.h +0 -0
similarity index 100%
rename from test/test/test_flow_classify.h
rename to app/test/test_flow_classify.h
app/test/test_func_reentrancy.c renamed from test/test/test_func_reentrancy.c +0 -0
similarity index 100%
rename from test/test/test_func_reentrancy.c
rename to app/test/test_func_reentrancy.c
app/test/test_hash.c renamed from test/test/test_hash.c +0 -0
similarity index 100%
rename from test/test/test_hash.c
rename to app/test/test_hash.c
app/test/test_hash_functions.c renamed from test/test/test_hash_functions.c +0 -0
similarity index 100%
rename from test/test/test_hash_functions.c
rename to app/test/test_hash_functions.c
app/test/test_hash_multiwriter.c renamed from test/test/test_hash_multiwriter.c +0 -0
similarity index 100%
rename from test/test/test_hash_multiwriter.c
rename to app/test/test_hash_multiwriter.c
app/test/test_hash_perf.c renamed from test/test/test_hash_perf.c +0 -0
similarity index 100%
rename from test/test/test_hash_perf.c
rename to app/test/test_hash_perf.c
app/test/test_hash_readwrite.c renamed from test/test/test_hash_readwrite.c +0 -0
similarity index 100%
rename from test/test/test_hash_readwrite.c
rename to app/test/test_hash_readwrite.c
app/test/test_hash_readwrite_lf.c renamed from test/test/test_hash_readwrite_lf.c +0 -0
similarity index 100%
rename from test/test/test_hash_readwrite_lf.c
rename to app/test/test_hash_readwrite_lf.c
app/test/test_interrupts.c renamed from test/test/test_interrupts.c +0 -0
similarity index 100%
rename from test/test/test_interrupts.c
rename to app/test/test_interrupts.c
app/test/test_ipsec.c renamed from test/test/test_ipsec.c +0 -0
similarity index 100%
rename from test/test/test_ipsec.c
rename to app/test/test_ipsec.c
app/test/test_kni.c renamed from test/test/test_kni.c +0 -0
similarity index 100%
rename from test/test/test_kni.c
rename to app/test/test_kni.c
app/test/test_kvargs.c renamed from test/test/test_kvargs.c +0 -0
similarity index 100%
rename from test/test/test_kvargs.c
rename to app/test/test_kvargs.c
app/test/test_latencystats.c renamed from test/test/test_latencystats.c +0 -0
similarity index 100%
rename from test/test/test_latencystats.c
rename to app/test/test_latencystats.c
app/test/test_link_bonding.c renamed from test/test/test_link_bonding.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding.c
rename to app/test/test_link_bonding.c
app/test/test_link_bonding_mode4.c renamed from test/test/test_link_bonding_mode4.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding_mode4.c
rename to app/test/test_link_bonding_mode4.c
app/test/test_link_bonding_rssconf.c renamed from test/test/test_link_bonding_rssconf.c +0 -0
similarity index 100%
rename from test/test/test_link_bonding_rssconf.c
rename to app/test/test_link_bonding_rssconf.c
app/test/test_logs.c renamed from test/test/test_logs.c +0 -0
similarity index 100%
rename from test/test/test_logs.c
rename to app/test/test_logs.c
app/test/test_lpm.c renamed from test/test/test_lpm.c +0 -0
similarity index 100%
rename from test/test/test_lpm.c
rename to app/test/test_lpm.c
app/test/test_lpm6.c renamed from test/test/test_lpm6.c +0 -0
similarity index 100%
rename from test/test/test_lpm6.c
rename to app/test/test_lpm6.c
app/test/test_lpm6_data.h renamed from test/test/test_lpm6_data.h +0 -0
similarity index 100%
rename from test/test/test_lpm6_data.h
rename to app/test/test_lpm6_data.h
app/test/test_lpm6_perf.c renamed from test/test/test_lpm6_perf.c +0 -0
similarity index 100%
rename from test/test/test_lpm6_perf.c
rename to app/test/test_lpm6_perf.c
app/test/test_lpm_perf.c renamed from test/test/test_lpm_perf.c +0 -0
similarity index 100%
rename from test/test/test_lpm_perf.c
rename to app/test/test_lpm_perf.c
app/test/test_malloc.c renamed from test/test/test_malloc.c +0 -0
similarity index 100%
rename from test/test/test_malloc.c
rename to app/test/test_malloc.c
app/test/test_mbuf.c renamed from test/test/test_mbuf.c +0 -0
similarity index 100%
rename from test/test/test_mbuf.c
rename to app/test/test_mbuf.c
app/test/test_member.c renamed from test/test/test_member.c +0 -0
similarity index 100%
rename from test/test/test_member.c
rename to app/test/test_member.c
app/test/test_member_perf.c renamed from test/test/test_member_perf.c +0 -0
similarity index 100%
rename from test/test/test_member_perf.c
rename to app/test/test_member_perf.c
app/test/test_memcpy.c renamed from test/test/test_memcpy.c +0 -0
similarity index 100%
rename from test/test/test_memcpy.c
rename to app/test/test_memcpy.c
app/test/test_memcpy_perf.c renamed from test/test/test_memcpy_perf.c +0 -0
similarity index 100%
rename from test/test/test_memcpy_perf.c
rename to app/test/test_memcpy_perf.c
app/test/test_memory.c renamed from test/test/test_memory.c +0 -0
similarity index 100%
rename from test/test/test_memory.c
rename to app/test/test_memory.c
app/test/test_mempool.c renamed from test/test/test_mempool.c +0 -0
similarity index 100%
rename from test/test/test_mempool.c
rename to app/test/test_mempool.c
app/test/test_mempool_perf.c renamed from test/test/test_mempool_perf.c +0 -0
similarity index 100%
rename from test/test/test_mempool_perf.c
rename to app/test/test_mempool_perf.c
app/test/test_memzone.c renamed from test/test/test_memzone.c +0 -0
similarity index 100%
rename from test/test/test_memzone.c
rename to app/test/test_memzone.c
app/test/test_meter.c renamed from test/test/test_meter.c +0 -0
similarity index 100%
rename from test/test/test_meter.c
rename to app/test/test_meter.c
app/test/test_metrics.c renamed from test/test/test_metrics.c +0 -0
similarity index 100%
rename from test/test/test_metrics.c
rename to app/test/test_metrics.c
app/test/test_mp_secondary.c renamed from test/test/test_mp_secondary.c +0 -0
similarity index 100%
rename from test/test/test_mp_secondary.c
rename to app/test/test_mp_secondary.c
app/test/test_pdump.c renamed from test/test/test_pdump.c +0 -0
similarity index 100%
rename from test/test/test_pdump.c
rename to app/test/test_pdump.c
app/test/test_pdump.h renamed from test/test/test_pdump.h +0 -0
similarity index 100%
rename from test/test/test_pdump.h
rename to app/test/test_pdump.h
app/test/test_per_lcore.c renamed from test/test/test_per_lcore.c +0 -0
similarity index 100%
rename from test/test/test_per_lcore.c
rename to app/test/test_per_lcore.c
app/test/test_pmd_perf.c renamed from test/test/test_pmd_perf.c +0 -0
similarity index 100%
rename from test/test/test_pmd_perf.c
rename to app/test/test_pmd_perf.c
app/test/test_pmd_ring.c renamed from test/test/test_pmd_ring.c +0 -0
similarity index 100%
rename from test/test/test_pmd_ring.c
rename to app/test/test_pmd_ring.c
app/test/test_pmd_ring_perf.c renamed from test/test/test_pmd_ring_perf.c +0 -0
similarity index 100%
rename from test/test/test_pmd_ring_perf.c
rename to app/test/test_pmd_ring_perf.c
app/test/test_power.c renamed from test/test/test_power.c +0 -0
similarity index 100%
rename from test/test/test_power.c
rename to app/test/test_power.c
app/test/test_power_acpi_cpufreq.c renamed from test/test/test_power_acpi_cpufreq.c +0 -0
similarity index 100%
rename from test/test/test_power_acpi_cpufreq.c
rename to app/test/test_power_acpi_cpufreq.c
app/test/test_power_kvm_vm.c renamed from test/test/test_power_kvm_vm.c +0 -0
similarity index 100%
rename from test/test/test_power_kvm_vm.c
rename to app/test/test_power_kvm_vm.c
app/test/test_prefetch.c renamed from test/test/test_prefetch.c +0 -0
similarity index 100%
rename from test/test/test_prefetch.c
rename to app/test/test_prefetch.c
app/test/test_rawdev.c renamed from test/test/test_rawdev.c +0 -0
similarity index 100%
rename from test/test/test_rawdev.c
rename to app/test/test_rawdev.c
app/test/test_reciprocal_division.c renamed from test/test/test_reciprocal_division.c +0 -0
similarity index 100%
rename from test/test/test_reciprocal_division.c
rename to app/test/test_reciprocal_division.c
app/test/test_reciprocal_division_perf.c renamed from test/test/test_reciprocal_division_perf.c +0 -0
similarity index 100%
rename from test/test/test_reciprocal_division_perf.c
rename to app/test/test_reciprocal_division_perf.c
app/test/test_red.c renamed from test/test/test_red.c +0 -0
similarity index 100%
rename from test/test/test_red.c
rename to app/test/test_red.c
app/test/test_reorder.c renamed from test/test/test_reorder.c +0 -0
similarity index 100%
rename from test/test/test_reorder.c
rename to app/test/test_reorder.c
app/test/test_resource.c renamed from test/test/test_resource.c +0 -0
similarity index 100%
rename from test/test/test_resource.c
rename to app/test/test_resource.c
app/test/test_ring.c renamed from test/test/test_ring.c +0 -0
similarity index 100%
rename from test/test/test_ring.c
rename to app/test/test_ring.c
app/test/test_ring_perf.c renamed from test/test/test_ring_perf.c +0 -0
similarity index 100%
rename from test/test/test_ring_perf.c
rename to app/test/test_ring_perf.c
app/test/test_rwlock.c renamed from test/test/test_rwlock.c +0 -0
similarity index 100%
rename from test/test/test_rwlock.c
rename to app/test/test_rwlock.c
app/test/test_sched.c renamed from test/test/test_sched.c +0 -0
similarity index 100%
rename from test/test/test_sched.c
rename to app/test/test_sched.c
app/test/test_service_cores.c renamed from test/test/test_service_cores.c +0 -0
similarity index 100%
rename from test/test/test_service_cores.c
rename to app/test/test_service_cores.c
app/test/test_spinlock.c renamed from test/test/test_spinlock.c +0 -0
similarity index 100%
rename from test/test/test_spinlock.c
rename to app/test/test_spinlock.c
app/test/test_string_fns.c renamed from test/test/test_string_fns.c +0 -0
similarity index 100%
rename from test/test/test_string_fns.c
rename to app/test/test_string_fns.c
app/test/test_table.c renamed from test/test/test_table.c +0 -0
similarity index 100%
rename from test/test/test_table.c
rename to app/test/test_table.c
app/test/test_table.h renamed from test/test/test_table.h +0 -0
similarity index 100%
rename from test/test/test_table.h
rename to app/test/test_table.h
app/test/test_table_acl.c renamed from test/test/test_table_acl.c +0 -0
similarity index 100%
rename from test/test/test_table_acl.c
rename to app/test/test_table_acl.c
app/test/test_table_acl.h renamed from test/test/test_table_acl.h +0 -0
similarity index 100%
rename from test/test/test_table_acl.h
rename to app/test/test_table_acl.h
app/test/test_table_combined.c renamed from test/test/test_table_combined.c +0 -0
similarity index 100%
rename from test/test/test_table_combined.c
rename to app/test/test_table_combined.c
app/test/test_table_combined.h renamed from test/test/test_table_combined.h +0 -0
similarity index 100%
rename from test/test/test_table_combined.h
rename to app/test/test_table_combined.h
app/test/test_table_pipeline.c renamed from test/test/test_table_pipeline.c +0 -0
similarity index 100%
rename from test/test/test_table_pipeline.c
rename to app/test/test_table_pipeline.c
app/test/test_table_pipeline.h renamed from test/test/test_table_pipeline.h +0 -0
similarity index 100%
rename from test/test/test_table_pipeline.h
rename to app/test/test_table_pipeline.h
app/test/test_table_ports.c renamed from test/test/test_table_ports.c +0 -0
similarity index 100%
rename from test/test/test_table_ports.c
rename to app/test/test_table_ports.c
app/test/test_table_ports.h renamed from test/test/test_table_ports.h +0 -0
similarity index 100%
rename from test/test/test_table_ports.h
rename to app/test/test_table_ports.h
app/test/test_table_tables.c renamed from test/test/test_table_tables.c +0 -0
similarity index 100%
rename from test/test/test_table_tables.c
rename to app/test/test_table_tables.c
app/test/test_table_tables.h renamed from test/test/test_table_tables.h +0 -0
similarity index 100%
rename from test/test/test_table_tables.h
rename to app/test/test_table_tables.h
app/test/test_tailq.c renamed from test/test/test_tailq.c +0 -0
similarity index 100%
rename from test/test/test_tailq.c
rename to app/test/test_tailq.c
app/test/test_thash.c renamed from test/test/test_thash.c +0 -0
similarity index 100%
rename from test/test/test_thash.c
rename to app/test/test_thash.c
app/test/test_timer.c renamed from test/test/test_timer.c +0 -0
similarity index 100%
rename from test/test/test_timer.c
rename to app/test/test_timer.c
app/test/test_timer_perf.c renamed from test/test/test_timer_perf.c +0 -0
similarity index 100%
rename from test/test/test_timer_perf.c
rename to app/test/test_timer_perf.c
app/test/test_timer_racecond.c renamed from test/test/test_timer_racecond.c +0 -0
similarity index 100%
rename from test/test/test_timer_racecond.c
rename to app/test/test_timer_racecond.c
app/test/test_version.c renamed from test/test/test_version.c +0 -0
similarity index 100%
rename from test/test/test_version.c
rename to app/test/test_version.c
app/test/test_xmmt_ops.h renamed from test/test/test_xmmt_ops.h +0 -0
similarity index 100%
rename from test/test/test_xmmt_ops.h
rename to app/test/test_xmmt_ops.h
app/test/virtual_pmd.c renamed from test/test/virtual_pmd.c +0 -0
similarity index 100%
rename from test/test/virtual_pmd.c
rename to app/test/virtual_pmd.c
app/test/virtual_pmd.h renamed from test/test/virtual_pmd.h +0 -0
similarity index 100%
rename from test/test/virtual_pmd.h
rename to app/test/virtual_pmd.h
devtools/test-build.sh +0 -3
index d37b121ca..19ff759ed 100755
@@ -229,9 +229,6 @@ for conf in $configs ; do
 	make -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
 		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	! $short || break
-	echo "================== Build tests for $dir"
-	make test-build -j$J EXTRA_CFLAGS="$maxerr $DPDK_DEP_CFLAGS" \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
 	echo "================== Build examples for $dir"
 	export RTE_SDK=$(pwd)
 	export RTE_TARGET=$dir
doc/guides/compressdevs/octeontx.rst +1 -1
index 05dbd681b..c57d03a8e 100644
@@ -99,7 +99,7 @@ probed. To use the PMD in an application, user must:
       cd to the top-level DPDK directory
       export RTE_TARGET=arm64-thunderx-linuxapp-gcc
       export RTE_SDK=`pwd`
-      cd to test/test
+      cd to app/test
       type the command "make" to compile
       run the tests with "./test"
       type the command "compressdev_autotest" to test
doc/guides/cryptodevs/qat.rst +2 -2
index b079aa381..9207bfa55 100644
@@ -530,7 +530,7 @@ Testing
 QAT crypto PMD can be tested by running the test application::
 
     make defconfig
-    make test-build -j
+    make -j
     cd ./build/app
     ./test -l1 -n1 -w <your qat bdf>
     RTE>>cryptodev_qat_autotest
@@ -539,7 +539,7 @@ QAT compression PMD can be tested by running the test application::
 
     make defconfig
     sed -i 's,\(CONFIG_RTE_COMPRESSDEV_TEST\)=n,\1=y,' build/.config
-    make test-build -j
+    make -j
     cd ./build/app
     ./test -l1 -n1 -w <your qat bdf>
     RTE>>compressdev_autotest
doc/guides/cryptodevs/virtio.rst +1 -1
index f3aa7c654..cfc6d57d7 100644
@@ -93,7 +93,7 @@ The unit test cases can be tested as below:
     cd to the top-level DPDK directory
     export RTE_TARGET=x86_64-native-linuxapp-gcc
     export RTE_SDK=`pwd`
-    cd to test/test
+    cd to app/test
     type the command "make" to compile
     run the tests with "./test"
     type the command "cryptodev_virtio_autotest" to test
doc/guides/mempool/octeontx.rst +1 -1
index e05aeb94c..3ade61fc2 100644
@@ -56,7 +56,7 @@ following ``make`` command:
 .. code-block:: console
 
    cd <DPDK-source-directory>
-   make config T=arm64-thunderx-linuxapp-gcc test-build
+   make config T=arm64-thunderx-linuxapp-gcc
 
 
 Initialization
doc/guides/prog_guide/compressdev.rst +1 -1
index 87e264906..ad9703753 100644
@@ -615,7 +615,7 @@ Sample code
 -----------
 
 There are unit test applications that show how to use the compressdev library inside
-test/test/test_compressdev.c
+app/test/test_compressdev.c
 
 Compression Device API
 ~~~~~~~~~~~~~~~~~~~~~~
meson.build +0 -1
index a6a034eb3..2bbd42bc8 100644
@@ -43,7 +43,6 @@ subdir('drivers')
 # build binaries and installable tools
 subdir('usertools')
 subdir('app')
-subdir('test')
 
 # build docs
 subdir('doc')
mk/rte.sdkbuild.mk +0 -3
index 5dc43e429..b512de1ec 100644
@@ -40,9 +40,6 @@ clean: $(CLEANDIRS)
 	$(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean
 	@echo Clean complete
 
-.PHONY: test-build
-test-build: test
-
 .SECONDEXPANSION:
 .PHONY: $(ROOTDIRS-y) $(ROOTDIRS-)
 $(ROOTDIRS-y) $(ROOTDIRS-):
mk/rte.sdkroot.mk +2 -4
index 18c88017e..d91583a63 100644
@@ -57,8 +57,8 @@ export BUILDDIR
 
 export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n
 
-.PHONY: default
-default: all
+.PHONY: default test-build
+default test-build: all
 
 .PHONY: config defconfig showconfigs showversion showversionum
 config defconfig showconfigs showversion showversionum:
@@ -72,8 +72,6 @@ cscope gtags tags etags:
 test test-fast test-perf coverage test-drivers test-dump:
 	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
 
-test: test-build
-
 .PHONY: install
 install:
 	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install
mk/rte.sdktest.mk +4 -4
index 295592809..803018ba3 100644
@@ -49,12 +49,12 @@ test test-fast test-perf test-drivers test-dump:
 	@mkdir -p $(AUTOTEST_DIR) ; \
 	cd $(AUTOTEST_DIR) ; \
 	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/test/test/autotest.py \
+		python $(RTE_SDK)/app/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST); \
 	else \
-		echo "No test found, please do a 'make test-build' first, or specify O=" ; \
+		echo "No test found, please do a 'make' first, or specify O=" ; \
 	fi
 
 # this is a special target to ease the pain of running coverage tests
@@ -66,11 +66,11 @@ coverage:
 		python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
 			$(RTE_OUTPUT)/app/cmdline_test; \
 		ulimit -S -n 100 ; \
-		python $(RTE_SDK)/test/test/autotest.py \
+		python $(RTE_SDK)/app/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST) ; \
 		$(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
 	else \
-		echo "No test found, please do a 'make test-build' first, or specify O=" ;\
+		echo "No test found, please do a 'make' first, or specify O=" ;\
 	fi
test/Makefile deleted +0 -8
deleted file mode 100644
index e9ae64b59..000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_APP_TEST) += test
-
-include $(RTE_SDK)/mk/rte.subdir.mk
test/meson.build deleted +0 -4
deleted file mode 100644
index 3ad11b34f..000000000
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-subdir('test')
Signature · 1 line
2.20.1
#32 lore raw

Re: [PATCH v3 0/5] consolidate testing apps to app dir

In reply to Bruce Richardson

26/02/2019 13:18, Bruce Richardson:

Quoted 17 lines

The apps for testing are split between the "test" and "app" directories, with a not-very-clear distinction between the two (at least to my mind).

Given how the apps are being built, the easiest path to having cmdline_test, test-acl and test-pipeline build using meson is to consolidate all these apps back into the app folder and use the logic there. The bpf folder doesn't contain an actual application, but rather example bpf code which can be loaded into testpmd. That is possibly best moved to the examples folder, but I'm open to feedback on the best place for it.

With these changes, the "test" folder then becomes the location for unit tests only. However, we can simplify things a little by moving that too to the app folder, eliminating the need for the separate "test-build" make target, and aligning the output folder for the binary from "make test-build" with the source file location in app.

Quoted 6 lines

---
V3: * Renamed the cmdline_test subdirectory to test-cmdline as part of the
move.
V2: * Following some discussion with Thomas, moved the autotests to the
app folder too.
* Updated maintainers file appropriately in each patch.

Applied, thanks