This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, master has been updated via 5d5304117434ab340cdd138066561e00a6b0642d (commit) via 79534012879ca74a68256ca40922b3fef7983611 (commit) via efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 (commit) via c79b041f389e56a2c713a507b75762e08d75e4b4 (commit) from 197710ffc229f3db775a97c27e09c2dc063497c4 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 5d5304117434ab340cdd138066561e00a6b0642d Author: Christophe Milard christophe.milard@linaro.org Date: Wed Jul 13 21:50:43 2016 +0200

doc: implementers guide update with the new structure

Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-and-tested-by: Yi He yi.he@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc index 4f49e8f..5c0e864 100644 --- a/doc/implementers-guide/implementers-guide.adoc +++ b/doc/implementers-guide/implementers-guide.adoc @@ -227,21 +227,30 @@ the underlying platform. They are written in plain C code, and may only use functions defined in the standard libC (C99) library (besides the ODP functions being tested, of course). A free C99 specification can be found at the http://www.open-std.org/JTC1/sc22/wg14/www/docs/n1256.pdf%5Bopen-std.org] -web site. No other languages (like scripting) are allowed as their usage +web site. No other languages (like scripting) are allowed as their usage would make assumptions on the platform capability.

-This area is located at `test/validation/` in the odp git repository. +This area is located at: `test/common_plat/`

-The ODP API itself is ordered by module, where each module groups the set of -ODP API functions related to the same "topic". Examples of modules includes -"classification" (API functions dealing with ingress packets classification), -time (functions dealing with time, excluding timers which have their own -module), timer,... The complete module list can be seen at: -http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html... -Modules] + Within the platform agnostic area, the tests are also grouped by -modules, matching the ODP API modules: `test/validation/` mainly contains a -list of directories matching each module name (as defined by the doxygen -`@defgroup` or `@ingroup` statement present in each API `.h` file). +In this directory, tests are grouped by category: + +* validation : groups of test defining the ODP compliance +* performance : tests checking system responsiveness +* miscellaneous + +Each ODP interface contains modules, where each module groups the set of ODP +functions related to the same "topic" for the given interface. +Examples of modules for the application interface includes "classification" +(API functions dealing with ingress packets classification), time +(functions dealing with time, excluding timers which have their own module), +timer, ... +The complete module list can be seen at: +http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html... Modules] + +Within the platform agnostic area, the validation tests for a given interface +are also grouped by modules, matching the ODP interface modules: for instance, +`test/common_plat/validation/api` mainly contains a list of +directories matching each module name (as defined by the doxygen `@defgroup` +or `@ingroup` statement present in each API `.h` file).

Within each of these directories, a library (called `libtest<module>.la`) and its associated `.h` file (called `<module>.h`) defines all the test functions @@ -253,9 +262,10 @@ for this module. See <<anchor-1, Module test and naming convention>> for more details.

It is important to be aware that the tests defined for a given module -(defined in `test/validation/<module>`) are focused to test the ODP functions -belonging to this module, but are not limited to use this module's ODP functions -only: many modules needs some interaction with some other module to be tested. +(defined in `test/common_plat/validation/api/<module>`) are focused to test +the ODP functions belonging to this module, but are not limited to use this +module's ODP functions only: many modules needs some interaction with some +other module to be tested. The obvious illustration of this is for module "init" whose functions are required by all tests of all other modules (as ODP needs to be initialized to test anything else). @@ -317,8 +327,8 @@ library.

=== Platform specific

-These tests are located under `platform/<platform>/test`. There is one such -area for each platform implementing ODP. This location will be referred as +These tests are located under `platform/<platform_name>/`. There is one such +area for each platform implementing ODP. This location will be referred as <PLATFORM_SPECIFIC> in the rest of this document.

==== The normal case @@ -329,55 +339,64 @@ simply needs to contain a single `Makefile.am` listing each of the executables listed in the automake TEST variable and will therefore be run on "make check".

For the linux-generic platform, most tested modules fall into this category: -currently, the `platform/linux-generic/test/Makefile.am` looks as follows: +currently, the `test/linux-generic/test/Makefile.am` looks +roughly as follows:

[source,am] ---- include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation + +ALL_API_VALIDATION = ${top_builddir}/test/common_plat/validation/api

-ODP_MODULES = pktio +SUBDIRS =

if test_vald -TESTS = pktio/pktio_run \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/synchronizers/synchronizers_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) - -SUBDIRS = $(ODP_MODULES) -endif +TESTS = validation/api/pktio/pktio_run.sh \ + validation/api/pktio/pktio_run_tap.sh \ + $(ALL_API_VALIDATION)/atomic/atomic_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/barrier/barrier_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/classification/classification_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/cpumask/cpumask_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/crypto/crypto_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/errno/errno_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/hash/hash_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_ok$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_abort$(EXEEXT) \ + $(ALL_API_VALIDATION)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION)/lock/lock_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/packet/packet_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/pool/pool_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/queue/queue_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/random/random_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/scheduler/scheduler_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/std_clib/std_clib_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/thread/thread_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/time/time_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/timer/timer_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/shmem/shmem_main$(EXEEXT) \ + $(ALL_API_VALIDATION)/system/system_main$(EXEEXT) \ +

----

With the exception for module pktio, all other modules testing just involves -calling the platform agnostic <module>_main executables (in test/validation). +calling the platform agnostic <module>_main executables (in +/test/common_plat/validation/api).

==== Using other languages

The pktio module, above, is actually tested using a bash script. This script is needed to set up the interfaces used by the tests. The `pktio_run` script -eventually calls the platform agnostic `test/validation/pktio/pktio_main` after -setting up the interfaces needed by the tests. -Notice that the path to the script, `pktio/pktio_run`, is pointing to a file -within the <PLATFORM_SPECIFIC> tree so is private to this platform. Any -languages supported by the tested platform can be used there, as it will not -impact other platforms. +eventually calls the platform agnostic +`test/common_plat/validation/api/pktio/pktio_main` after setting up the +interfaces needed by the tests. +Notice that the path to the script, `validation/api/pktio/pktio_run.sh`, +is pointing to a file within the <PLATFORM_SPECIFIC> tree so is private to +this platform. Any languages supported by the tested platform can be used +there, as it will not impact other platforms. The platform "private" executables (such as this script), of course, must also return one of the return code expected by the automake test harness (0 for success, 77 for skipped, other values for errors). @@ -438,15 +457,20 @@ Sometimes, it may be necessary to call platform specific system calls to check some functionality: For instance, testing `odp_cpumask_*` could involve checking the underlying system CPU mask. On linux, such a test would require using the CPU_ISSET macro, which is linux specific. Such a test would be written in -`<PLATFORM_SPECIFIC>/cpumask/...` The contents of this directory would be very -similar to the contents of the platform agnostic side cpu_mask tests -(including a `Makefile.am`), but platform specific test would be written there. +`<PLATFORM_SPECIFIC>/<test-group>/<interface>/cpumask/...` The contents of +this directory would be very similar to the contents of the platform agnostic +side cpu_mask tests (including a `Makefile.am`...), but platform specific test +would be written there. `<PLATFORM_SPECIFIC>/Makefile.am` would then trigger the building of the platform specific tests (by listing their module name in `SUBDIRS` and therefore calling the appropriate `Makefile.am`) and then it would call both the platform agnostic executable(s) and the platform specific test executable.

-==== Marking tests as inactive +The shm module of the linux-generic ODP API does have a validation +test written this way. You can see it at: +`test/linux-generic/validation/api/shmem` + +==== Marking validation tests as inactive

The general policy is that a full run of the validation suite (a `make check`) must pass at all times. However a particular platform may have one or more test @@ -464,7 +488,8 @@ modify the properties of previously registered tests, for example to mark them as inactive. Inactive tests are registered with the test framework but aren't executed and will be recorded as inactive in test reports.

-In `test/validation/foo/foo.c`, define all tests for the `foo` module: +In `test/common_plat/validation/api/foo/foo.c`, define all +validation tests for the 'foo' module:

[source,c] ------------------ @@ -480,7 +505,7 @@ odp_suiteinfo_t foo_suites[] = { }; ------------------

-In `platform/<platform>/test/foo/foo_main.c`, register all the tests defined in +In `<platform>/validation/api/foo/foo_main.c`, register all the tests defined in the `foo` module, then mark a single specific test case as inactive:

[source,c]

commit 79534012879ca74a68256ca40922b3fef7983611 Author: Christophe Milard christophe.milard@linaro.org Date: Wed Jul 13 21:50:42 2016 +0200

test: restructuring platform-specific tests to allow other interface

test/platform/<platform_name>/* moves to: test/<platform_name>/validation/api/ Two reasons: *test/platform/<platform_name>/ now moves to test/<platform_name>, hence at the same level than "common_plat" clearly separating between platform agnostic and platform specific parts. *Also, under test/<platform_name>, the test group "validation" and interface "api" are created, hence allowing for other tests type to have platform specifics (for instance running perf test from platform side to set proper pktios), and allowing other interfaces to be tested under validation.

Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-and-tested-by: Yi He yi.he@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index c0eb207..c0f0f21 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ IMPLEMENTATION_NAME="" if test "${with_platform}" == "linux-generic"; then m4_include([./platform/linux-generic/m4/configure.m4]) - m4_include([./test/platform/linux-generic/m4/configure.m4]) + m4_include([./test/linux-generic/m4/configure.m4]) IMPLEMENTATION_NAME="odp-linux" else echo "UNSUPPORTED PLATFORM: ${with_platform}" diff --git a/test/Makefile.am b/test/Makefile.am index 59532c8..3b59173 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1 @@ -SUBDIRS = common_plat - -if cunit_support - SUBDIRS += @platform_with_platform@ -endif +SUBDIRS = common_plat @with_platform@ diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh index 68e4498..e64aa47 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -30,6 +30,8 @@ PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77

+PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$ODP_PLATFORM/validation + # Use installed pktio env or for make check take it from platform directory if [ -f "./pktio_env" ]; then . ./pktio_env @@ -37,8 +39,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env +elif [ -f ${PLATFORM_VALIDATION}/api/pktio/pktio_env ]; then + . ${PLATFORM_VALIDATION}/api/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/$ODP_PLATFORM/test." diff --git a/test/platform/linux-generic/.gitignore b/test/linux-generic/.gitignore similarity index 100% rename from test/platform/linux-generic/.gitignore rename to test/linux-generic/.gitignore diff --git a/test/platform/linux-generic/Makefile.am b/test/linux-generic/Makefile.am similarity index 81% rename from test/platform/linux-generic/Makefile.am rename to test/linux-generic/Makefile.am index 83da140..f5cc52d 100644 --- a/test/platform/linux-generic/Makefile.am +++ b/test/linux-generic/Makefile.am @@ -1,17 +1,14 @@ include $(top_srcdir)/test/Makefile.inc TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation

-ODP_MODULES = pktio \ - ring \ - shmem - ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api

+SUBDIRS = + if test_vald -TESTS = pktio/pktio_run.sh \ - pktio/pktio_run_tap.sh \ - ring/ring_main$(EXEEXT) \ - shmem/shmem_linux \ +TESTS = validation/api/pktio/pktio_run.sh \ + validation/api/pktio/pktio_run_tap.sh \ + validation/api/shmem/shmem_linux \ $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ @@ -35,22 +32,32 @@ TESTS = pktio/pktio_run.sh \ $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ - $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) + $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT) \ + ring/ring_main$(EXEEXT)

-SUBDIRS = $(ODP_MODULES) +SUBDIRS += validation/api/pktio\ + validation/api/shmem\ + pktio_ipc\ + ring

if HAVE_PCAP -TESTS += pktio/pktio_run_pcap.sh +TESTS += validation/api/pktio/pktio_run_pcap.sh +endif +if netmap_support +TESTS += validation/api/pktio/pktio_run_netmap.sh endif +if PKTIO_DPDK +TESTS += validation/api/pktio/pktio_run_dpdk.sh +endif + if PKTIO_IPC TESTS += pktio_ipc/pktio_ipc_run.sh SUBDIRS += pktio_ipc endif -if netmap_support -TESTS += pktio/pktio_run_netmap.sh -endif -if PKTIO_DPDK -TESTS += pktio/pktio_run_dpdk.sh +else +#performance tests refer to pktio_env +if test_perf +SUBDIRS += validation/api/pktio endif endif

@@ -70,7 +77,3 @@ installcheck-local: $(DESTDIR)/$(testdir)/run-test endif

-#performance tests refer to pktio_env -if test_perf -SUBDIRS = pktio -endif diff --git a/test/platform/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc similarity index 100% rename from test/platform/linux-generic/Makefile.inc rename to test/linux-generic/Makefile.inc diff --git a/test/linux-generic/m4/configure.m4 b/test/linux-generic/m4/configure.m4 new file mode 100644 index 0000000..9eec545 --- /dev/null +++ b/test/linux-generic/m4/configure.m4 @@ -0,0 +1,5 @@ +AC_CONFIG_FILES([test/linux-generic/Makefile + test/linux-generic/validation/api/shmem/Makefile + test/linux-generic/validation/api/pktio/Makefile + test/linux-generic/pktio_ipc/Makefile + test/linux-generic/ring/Makefile]) diff --git a/test/platform/linux-generic/pktio_ipc/.gitignore b/test/linux-generic/pktio_ipc/.gitignore similarity index 100% rename from test/platform/linux-generic/pktio_ipc/.gitignore rename to test/linux-generic/pktio_ipc/.gitignore diff --git a/test/platform/linux-generic/pktio_ipc/Makefile.am b/test/linux-generic/pktio_ipc/Makefile.am similarity index 100% rename from test/platform/linux-generic/pktio_ipc/Makefile.am rename to test/linux-generic/pktio_ipc/Makefile.am diff --git a/test/platform/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/ipc_common.c rename to test/linux-generic/pktio_ipc/ipc_common.c diff --git a/test/platform/linux-generic/pktio_ipc/ipc_common.h b/test/linux-generic/pktio_ipc/ipc_common.h similarity index 100% rename from test/platform/linux-generic/pktio_ipc/ipc_common.h rename to test/linux-generic/pktio_ipc/ipc_common.h diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc1.c rename to test/linux-generic/pktio_ipc/pktio_ipc1.c diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc2.c rename to test/linux-generic/pktio_ipc/pktio_ipc2.c diff --git a/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh similarity index 100% rename from test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh rename to test/linux-generic/pktio_ipc/pktio_ipc_run.sh diff --git a/test/platform/linux-generic/ring/.gitignore b/test/linux-generic/ring/.gitignore similarity index 100% rename from test/platform/linux-generic/ring/.gitignore rename to test/linux-generic/ring/.gitignore diff --git a/test/platform/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am similarity index 100% rename from test/platform/linux-generic/ring/Makefile.am rename to test/linux-generic/ring/Makefile.am diff --git a/test/platform/linux-generic/ring/ring_basic.c b/test/linux-generic/ring/ring_basic.c similarity index 100% rename from test/platform/linux-generic/ring/ring_basic.c rename to test/linux-generic/ring/ring_basic.c diff --git a/test/platform/linux-generic/ring/ring_main.c b/test/linux-generic/ring/ring_main.c similarity index 100% rename from test/platform/linux-generic/ring/ring_main.c rename to test/linux-generic/ring/ring_main.c diff --git a/test/platform/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c similarity index 100% rename from test/platform/linux-generic/ring/ring_stress.c rename to test/linux-generic/ring/ring_stress.c diff --git a/test/platform/linux-generic/ring/ring_suites.c b/test/linux-generic/ring/ring_suites.c similarity index 100% rename from test/platform/linux-generic/ring/ring_suites.c rename to test/linux-generic/ring/ring_suites.c diff --git a/test/platform/linux-generic/ring/ring_suites.h b/test/linux-generic/ring/ring_suites.h similarity index 100% rename from test/platform/linux-generic/ring/ring_suites.h rename to test/linux-generic/ring/ring_suites.h diff --git a/test/platform/linux-generic/run-test b/test/linux-generic/run-test similarity index 100% rename from test/platform/linux-generic/run-test rename to test/linux-generic/run-test diff --git a/test/linux-generic/validation/Makefile.inc b/test/linux-generic/validation/Makefile.inc new file mode 100644 index 0000000..cf1dedb --- /dev/null +++ b/test/linux-generic/validation/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/test/linux-generic/Makefile.inc diff --git a/test/linux-generic/validation/api/Makefile.inc b/test/linux-generic/validation/api/Makefile.inc new file mode 100644 index 0000000..19c9448 --- /dev/null +++ b/test/linux-generic/validation/api/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/test/linux-generic/validation/Makefile.inc diff --git a/test/platform/linux-generic/pktio/.gitignore b/test/linux-generic/validation/api/pktio/.gitignore similarity index 100% rename from test/platform/linux-generic/pktio/.gitignore rename to test/linux-generic/validation/api/pktio/.gitignore diff --git a/test/platform/linux-generic/pktio/Makefile.am b/test/linux-generic/validation/api/pktio/Makefile.am similarity index 100% rename from test/platform/linux-generic/pktio/Makefile.am rename to test/linux-generic/validation/api/pktio/Makefile.am diff --git a/test/platform/linux-generic/pktio/pktio_env b/test/linux-generic/validation/api/pktio/pktio_env similarity index 100% rename from test/platform/linux-generic/pktio/pktio_env rename to test/linux-generic/validation/api/pktio/pktio_env diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/linux-generic/validation/api/pktio/pktio_run.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run.sh rename to test/linux-generic/validation/api/pktio/pktio_run.sh index 0905b8b..e8b0f93 100755 --- a/test/platform/linux-generic/pktio/pktio_run.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_dpdk.sh rename to test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh index 4d16b29..fa46fa4 100755 --- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_netmap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_netmap.sh index 6fd271b..7dde7ae 100755 --- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh similarity index 93% rename from test/platform/linux-generic/pktio/pktio_run_pcap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_pcap.sh index 721141a..b5b7735 100755 --- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/linux-generic/validation/api/pktio/pktio_run_tap.sh similarity index 97% rename from test/platform/linux-generic/pktio/pktio_run_tap.sh rename to test/linux-generic/validation/api/pktio/pktio_run_tap.sh index 96f6d5a..89579ca 100755 --- a/test/platform/linux-generic/pktio/pktio_run_tap.sh +++ b/test/linux-generic/validation/api/pktio/pktio_run_tap.sh @@ -18,7 +18,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../common_plat/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/shmem/.gitignore b/test/linux-generic/validation/api/shmem/.gitignore similarity index 100% rename from test/platform/linux-generic/shmem/.gitignore rename to test/linux-generic/validation/api/shmem/.gitignore diff --git a/test/platform/linux-generic/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am similarity index 100% rename from test/platform/linux-generic/shmem/Makefile.am rename to test/linux-generic/validation/api/shmem/Makefile.am diff --git a/test/platform/linux-generic/shmem/shmem.h b/test/linux-generic/validation/api/shmem/shmem.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem.h rename to test/linux-generic/validation/api/shmem/shmem.h diff --git a/test/platform/linux-generic/shmem/shmem_common.h b/test/linux-generic/validation/api/shmem/shmem_common.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_common.h rename to test/linux-generic/validation/api/shmem/shmem_common.h diff --git a/test/platform/linux-generic/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c similarity index 100% rename from test/platform/linux-generic/shmem/shmem_linux.c rename to test/linux-generic/validation/api/shmem/shmem_linux.c diff --git a/test/platform/linux-generic/shmem/shmem_linux.h b/test/linux-generic/validation/api/shmem/shmem_linux.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_linux.h rename to test/linux-generic/validation/api/shmem/shmem_linux.h diff --git a/test/platform/linux-generic/shmem/shmem_odp.c b/test/linux-generic/validation/api/shmem/shmem_odp.c similarity index 100% rename from test/platform/linux-generic/shmem/shmem_odp.c rename to test/linux-generic/validation/api/shmem/shmem_odp.c diff --git a/test/platform/linux-generic/shmem/shmem_odp.h b/test/linux-generic/validation/api/shmem/shmem_odp.h similarity index 100% rename from test/platform/linux-generic/shmem/shmem_odp.h rename to test/linux-generic/validation/api/shmem/shmem_odp.h diff --git a/test/platform/linux-generic/m4/configure.m4 b/test/platform/linux-generic/m4/configure.m4 deleted file mode 100644 index 8c3db21..0000000 --- a/test/platform/linux-generic/m4/configure.m4 +++ /dev/null @@ -1,5 +0,0 @@ -AC_CONFIG_FILES([test/platform/linux-generic/Makefile - test/platform/linux-generic/shmem/Makefile - test/platform/linux-generic/pktio/Makefile - test/platform/linux-generic/pktio_ipc/Makefile - test/platform/linux-generic/ring/Makefile])

commit efa6bc89a4e7a5823a3c8c27fcdc9573d7ac5694 Author: Christophe Milard christophe.milard@linaro.org Date: Wed Jul 13 21:50:41 2016 +0200

validation: moving api validation tests to prepare for new interfaces

API tests are now moved to test/common_plat/validation/api (from test/validation), The reason for this move is two folded: * Moving down validation to all-plaforms/validation disambiguates the meaning of validation (which up to now was referring to both platform agnostic tests and to the set of tests to pass to be ODP compatible). Now things in test/common_plat/ are platform agnostic. So test/common_plat/validation/* are platform agnostic things for the validation tests, as much as test/common_plat/performance are platform agnostic things for the performance tests. * creating the api directory under "validation" simply enable adding other interfaces (such as future drv) as part of the validation tests

Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-and-tested-by: Yi He yi.he@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/test/Makefile.am b/test/Makefile.am index 8bab8fd..59532c8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = performance miscellaneous +SUBDIRS = common_plat

if cunit_support - SUBDIRS += validation @platform_with_platform@ + SUBDIRS += @platform_with_platform@ endif diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am new file mode 100644 index 0000000..af78bb6 --- /dev/null +++ b/test/common_plat/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = + +if cunit_support +SUBDIRS += common +endif + +SUBDIRS += performance miscellaneous validation diff --git a/test/validation/common/Makefile.am b/test/common_plat/common/Makefile.am similarity index 100% rename from test/validation/common/Makefile.am rename to test/common_plat/common/Makefile.am diff --git a/test/validation/common/mask_common.c b/test/common_plat/common/mask_common.c similarity index 100% rename from test/validation/common/mask_common.c rename to test/common_plat/common/mask_common.c diff --git a/test/validation/common/mask_common.h b/test/common_plat/common/mask_common.h similarity index 100% rename from test/validation/common/mask_common.h rename to test/common_plat/common/mask_common.h diff --git a/test/validation/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c similarity index 100% rename from test/validation/common/odp_cunit_common.c rename to test/common_plat/common/odp_cunit_common.c diff --git a/test/validation/common/odp_cunit_common.h b/test/common_plat/common/odp_cunit_common.h similarity index 100% rename from test/validation/common/odp_cunit_common.h rename to test/common_plat/common/odp_cunit_common.h diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 new file mode 100644 index 0000000..be878bd --- /dev/null +++ b/test/common_plat/m4/configure.m4 @@ -0,0 +1,33 @@ +m4_include([test/common_plat/m4/miscellaneous.m4]) +m4_include([test/common_plat/m4/performance.m4]) +m4_include([test/common_plat/m4/validation.m4]) + +AC_CONFIG_FILES([test/common_plat/Makefile + test/common_plat/common/Makefile + test/common_plat/miscellaneous/Makefile + test/common_plat/performance/Makefile + test/common_plat/validation/Makefile + test/common_plat/validation/api/atomic/Makefile + test/common_plat/validation/api/barrier/Makefile + test/common_plat/validation/api/buffer/Makefile + test/common_plat/validation/api/classification/Makefile + test/common_plat/validation/api/cpumask/Makefile + test/common_plat/validation/api/crypto/Makefile + test/common_plat/validation/api/errno/Makefile + test/common_plat/validation/api/hash/Makefile + test/common_plat/validation/api/init/Makefile + test/common_plat/validation/api/lock/Makefile + test/common_plat/validation/api/Makefile + test/common_plat/validation/api/packet/Makefile + test/common_plat/validation/api/pktio/Makefile + test/common_plat/validation/api/pool/Makefile + test/common_plat/validation/api/queue/Makefile + test/common_plat/validation/api/random/Makefile + test/common_plat/validation/api/scheduler/Makefile + test/common_plat/validation/api/shmem/Makefile + test/common_plat/validation/api/std_clib/Makefile + test/common_plat/validation/api/system/Makefile + test/common_plat/validation/api/thread/Makefile + test/common_plat/validation/api/time/Makefile + test/common_plat/validation/api/timer/Makefile + test/common_plat/validation/api/traffic_mngr/Makefile]) diff --git a/test/m4/miscellaneous.m4 b/test/common_plat/m4/miscellaneous.m4 similarity index 100% rename from test/m4/miscellaneous.m4 rename to test/common_plat/m4/miscellaneous.m4 diff --git a/test/m4/performance.m4 b/test/common_plat/m4/performance.m4 similarity index 100% rename from test/m4/performance.m4 rename to test/common_plat/m4/performance.m4 diff --git a/test/m4/validation.m4 b/test/common_plat/m4/validation.m4 similarity index 100% rename from test/m4/validation.m4 rename to test/common_plat/m4/validation.m4 diff --git a/test/miscellaneous/.gitignore b/test/common_plat/miscellaneous/.gitignore similarity index 100% rename from test/miscellaneous/.gitignore rename to test/common_plat/miscellaneous/.gitignore diff --git a/test/miscellaneous/Makefile.am b/test/common_plat/miscellaneous/Makefile.am similarity index 100% rename from test/miscellaneous/Makefile.am rename to test/common_plat/miscellaneous/Makefile.am diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/common_plat/miscellaneous/odp_api_from_cpp.cpp similarity index 100% rename from test/miscellaneous/odp_api_from_cpp.cpp rename to test/common_plat/miscellaneous/odp_api_from_cpp.cpp diff --git a/test/performance/.gitignore b/test/common_plat/performance/.gitignore similarity index 100% rename from test/performance/.gitignore rename to test/common_plat/performance/.gitignore diff --git a/test/performance/Makefile.am b/test/common_plat/performance/Makefile.am similarity index 100% rename from test/performance/Makefile.am rename to test/common_plat/performance/Makefile.am diff --git a/test/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c similarity index 100% rename from test/performance/odp_crypto.c rename to test/common_plat/performance/odp_crypto.c diff --git a/test/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c similarity index 100% rename from test/performance/odp_l2fwd.c rename to test/common_plat/performance/odp_l2fwd.c diff --git a/test/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh similarity index 93% rename from test/performance/odp_l2fwd_run.sh rename to test/common_plat/performance/odp_l2fwd_run.sh index 1fff087..68e4498 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/common_plat/performance/odp_l2fwd_run.sh @@ -25,7 +25,7 @@ TEST_DIR="${TEST_DIR:-$PWD}" # directory where test sources are, including scripts TEST_SRC_DIR=$(dirname $0)

-PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH +PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH

# exit codes expected by automake for skipped tests TEST_SKIPPED=77 @@ -37,8 +37,8 @@ elif [ "$ODP_PLATFORM" = "" ]; then echo "$0: error: ODP_PLATFORM must be defined" # not skipped as this should never happen via "make check" exit 1 -elif [ -f ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env ]; then - . ${TEST_SRC_DIR}/../platform/$ODP_PLATFORM/pktio/pktio_env +elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env ]; then + . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/pktio/pktio_env else echo "BUG: unable to find pktio_env!" echo "pktio_env has to be in current directory or in platform/$ODP_PLATFORM/test." diff --git a/test/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c similarity index 100% rename from test/performance/odp_pktio_perf.c rename to test/common_plat/performance/odp_pktio_perf.c diff --git a/test/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c similarity index 100% rename from test/performance/odp_scheduling.c rename to test/common_plat/performance/odp_scheduling.c diff --git a/test/performance/odp_scheduling_run.sh b/test/common_plat/performance/odp_scheduling_run.sh similarity index 100% rename from test/performance/odp_scheduling_run.sh rename to test/common_plat/performance/odp_scheduling_run.sh diff --git a/test/common_plat/validation/Makefile.am b/test/common_plat/validation/Makefile.am new file mode 100644 index 0000000..5d525fb --- /dev/null +++ b/test/common_plat/validation/Makefile.am @@ -0,0 +1,3 @@ +if cunit_support + SUBDIRS = api +endif diff --git a/test/validation/.gitignore b/test/common_plat/validation/api/.gitignore similarity index 100% rename from test/validation/.gitignore rename to test/common_plat/validation/api/.gitignore diff --git a/test/validation/Makefile.am b/test/common_plat/validation/api/Makefile.am similarity index 93% rename from test/validation/Makefile.am rename to test/common_plat/validation/api/Makefile.am index 90cc549..e2d30a6 100644 --- a/test/validation/Makefile.am +++ b/test/common_plat/validation/api/Makefile.am @@ -22,7 +22,7 @@ ODP_MODULES = atomic \ shmem \ system

-SUBDIRS = common $(ODP_MODULES) +SUBDIRS = $(ODP_MODULES)

#The tests will need to retain the deprecated test implementation AM_CFLAGS += -Wno-deprecated-declarations diff --git a/test/validation/Makefile.inc b/test/common_plat/validation/api/Makefile.inc similarity index 83% rename from test/validation/Makefile.inc rename to test/common_plat/validation/api/Makefile.inc index 9f36f9d..ffba620 100644 --- a/test/validation/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -1,13 +1,13 @@ include $(top_srcdir)/test/Makefile.inc

-COMMON_DIR = $(top_builddir)/test/validation/common +COMMON_DIR = $(top_builddir)/test/common_plat/common

#the following option ensure that option '-I.' is not passed to gcc, #therefore distinguishing between '#include "X"' and '#include <X>'. #It allows common filenames (such as 'errno.h') to be used locally. AUTOMAKE_OPTIONS = nostdinc

-AM_CFLAGS += -I$(top_srcdir)/test/validation/common +AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static

LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la diff --git a/test/validation/README b/test/common_plat/validation/api/README similarity index 100% rename from test/validation/README rename to test/common_plat/validation/api/README diff --git a/test/validation/atomic/.gitignore b/test/common_plat/validation/api/atomic/.gitignore similarity index 100% rename from test/validation/atomic/.gitignore rename to test/common_plat/validation/api/atomic/.gitignore diff --git a/test/validation/atomic/Makefile.am b/test/common_plat/validation/api/atomic/Makefile.am similarity index 100% rename from test/validation/atomic/Makefile.am rename to test/common_plat/validation/api/atomic/Makefile.am diff --git a/test/validation/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c similarity index 100% rename from test/validation/atomic/atomic.c rename to test/common_plat/validation/api/atomic/atomic.c diff --git a/test/validation/atomic/atomic.h b/test/common_plat/validation/api/atomic/atomic.h similarity index 100% rename from test/validation/atomic/atomic.h rename to test/common_plat/validation/api/atomic/atomic.h diff --git a/test/validation/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c similarity index 100% rename from test/validation/atomic/atomic_main.c rename to test/common_plat/validation/api/atomic/atomic_main.c diff --git a/test/validation/barrier/.gitignore b/test/common_plat/validation/api/barrier/.gitignore similarity index 100% rename from test/validation/barrier/.gitignore rename to test/common_plat/validation/api/barrier/.gitignore diff --git a/test/validation/barrier/Makefile.am b/test/common_plat/validation/api/barrier/Makefile.am similarity index 100% rename from test/validation/barrier/Makefile.am rename to test/common_plat/validation/api/barrier/Makefile.am diff --git a/test/validation/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c similarity index 100% rename from test/validation/barrier/barrier.c rename to test/common_plat/validation/api/barrier/barrier.c diff --git a/test/validation/barrier/barrier.h b/test/common_plat/validation/api/barrier/barrier.h similarity index 100% rename from test/validation/barrier/barrier.h rename to test/common_plat/validation/api/barrier/barrier.h diff --git a/test/validation/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c similarity index 100% rename from test/validation/barrier/barrier_main.c rename to test/common_plat/validation/api/barrier/barrier_main.c diff --git a/test/validation/buffer/.gitignore b/test/common_plat/validation/api/buffer/.gitignore similarity index 100% rename from test/validation/buffer/.gitignore rename to test/common_plat/validation/api/buffer/.gitignore diff --git a/test/validation/buffer/Makefile.am b/test/common_plat/validation/api/buffer/Makefile.am similarity index 100% rename from test/validation/buffer/Makefile.am rename to test/common_plat/validation/api/buffer/Makefile.am diff --git a/test/validation/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c similarity index 100% rename from test/validation/buffer/buffer.c rename to test/common_plat/validation/api/buffer/buffer.c diff --git a/test/validation/buffer/buffer.h b/test/common_plat/validation/api/buffer/buffer.h similarity index 100% rename from test/validation/buffer/buffer.h rename to test/common_plat/validation/api/buffer/buffer.h diff --git a/test/validation/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c similarity index 100% rename from test/validation/buffer/buffer_main.c rename to test/common_plat/validation/api/buffer/buffer_main.c diff --git a/test/validation/classification/.gitignore b/test/common_plat/validation/api/classification/.gitignore similarity index 100% rename from test/validation/classification/.gitignore rename to test/common_plat/validation/api/classification/.gitignore diff --git a/test/validation/classification/Makefile.am b/test/common_plat/validation/api/classification/Makefile.am similarity index 100% rename from test/validation/classification/Makefile.am rename to test/common_plat/validation/api/classification/Makefile.am diff --git a/test/validation/classification/classification.c b/test/common_plat/validation/api/classification/classification.c similarity index 100% rename from test/validation/classification/classification.c rename to test/common_plat/validation/api/classification/classification.c diff --git a/test/validation/classification/classification.h b/test/common_plat/validation/api/classification/classification.h similarity index 100% rename from test/validation/classification/classification.h rename to test/common_plat/validation/api/classification/classification.h diff --git a/test/validation/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c similarity index 100% rename from test/validation/classification/classification_main.c rename to test/common_plat/validation/api/classification/classification_main.c diff --git a/test/validation/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c similarity index 100% rename from test/validation/classification/odp_classification_basic.c rename to test/common_plat/validation/api/classification/odp_classification_basic.c diff --git a/test/validation/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c similarity index 100% rename from test/validation/classification/odp_classification_common.c rename to test/common_plat/validation/api/classification/odp_classification_common.c diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c similarity index 100% rename from test/validation/classification/odp_classification_test_pmr.c rename to test/common_plat/validation/api/classification/odp_classification_test_pmr.c diff --git a/test/validation/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c similarity index 100% rename from test/validation/classification/odp_classification_tests.c rename to test/common_plat/validation/api/classification/odp_classification_tests.c diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/common_plat/validation/api/classification/odp_classification_testsuites.h similarity index 100% rename from test/validation/classification/odp_classification_testsuites.h rename to test/common_plat/validation/api/classification/odp_classification_testsuites.h diff --git a/test/validation/cpumask/.gitignore b/test/common_plat/validation/api/cpumask/.gitignore similarity index 100% rename from test/validation/cpumask/.gitignore rename to test/common_plat/validation/api/cpumask/.gitignore diff --git a/test/validation/cpumask/Makefile.am b/test/common_plat/validation/api/cpumask/Makefile.am similarity index 100% rename from test/validation/cpumask/Makefile.am rename to test/common_plat/validation/api/cpumask/Makefile.am diff --git a/test/validation/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c similarity index 100% rename from test/validation/cpumask/cpumask.c rename to test/common_plat/validation/api/cpumask/cpumask.c diff --git a/test/validation/cpumask/cpumask.h b/test/common_plat/validation/api/cpumask/cpumask.h similarity index 100% rename from test/validation/cpumask/cpumask.h rename to test/common_plat/validation/api/cpumask/cpumask.h diff --git a/test/validation/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c similarity index 100% rename from test/validation/cpumask/cpumask_main.c rename to test/common_plat/validation/api/cpumask/cpumask_main.c diff --git a/test/validation/crypto/.gitignore b/test/common_plat/validation/api/crypto/.gitignore similarity index 100% rename from test/validation/crypto/.gitignore rename to test/common_plat/validation/api/crypto/.gitignore diff --git a/test/validation/crypto/Makefile.am b/test/common_plat/validation/api/crypto/Makefile.am similarity index 100% rename from test/validation/crypto/Makefile.am rename to test/common_plat/validation/api/crypto/Makefile.am diff --git a/test/validation/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c similarity index 100% rename from test/validation/crypto/crypto.c rename to test/common_plat/validation/api/crypto/crypto.c diff --git a/test/validation/crypto/crypto.h b/test/common_plat/validation/api/crypto/crypto.h similarity index 100% rename from test/validation/crypto/crypto.h rename to test/common_plat/validation/api/crypto/crypto.h diff --git a/test/validation/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c similarity index 100% rename from test/validation/crypto/crypto_main.c rename to test/common_plat/validation/api/crypto/crypto_main.c diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.c rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.c diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h similarity index 100% rename from test/validation/crypto/odp_crypto_test_inp.h rename to test/common_plat/validation/api/crypto/odp_crypto_test_inp.h diff --git a/test/validation/crypto/test_vectors.h b/test/common_plat/validation/api/crypto/test_vectors.h similarity index 100% rename from test/validation/crypto/test_vectors.h rename to test/common_plat/validation/api/crypto/test_vectors.h diff --git a/test/validation/crypto/test_vectors_len.h b/test/common_plat/validation/api/crypto/test_vectors_len.h similarity index 100% rename from test/validation/crypto/test_vectors_len.h rename to test/common_plat/validation/api/crypto/test_vectors_len.h diff --git a/test/validation/errno/.gitignore b/test/common_plat/validation/api/errno/.gitignore similarity index 100% rename from test/validation/errno/.gitignore rename to test/common_plat/validation/api/errno/.gitignore diff --git a/test/validation/errno/Makefile.am b/test/common_plat/validation/api/errno/Makefile.am similarity index 100% rename from test/validation/errno/Makefile.am rename to test/common_plat/validation/api/errno/Makefile.am diff --git a/test/validation/errno/errno.c b/test/common_plat/validation/api/errno/errno.c similarity index 100% rename from test/validation/errno/errno.c rename to test/common_plat/validation/api/errno/errno.c diff --git a/test/validation/errno/errno.h b/test/common_plat/validation/api/errno/errno.h similarity index 100% rename from test/validation/errno/errno.h rename to test/common_plat/validation/api/errno/errno.h diff --git a/test/validation/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c similarity index 100% rename from test/validation/errno/errno_main.c rename to test/common_plat/validation/api/errno/errno_main.c diff --git a/test/validation/hash/.gitignore b/test/common_plat/validation/api/hash/.gitignore similarity index 100% rename from test/validation/hash/.gitignore rename to test/common_plat/validation/api/hash/.gitignore diff --git a/test/validation/hash/Makefile.am b/test/common_plat/validation/api/hash/Makefile.am similarity index 100% rename from test/validation/hash/Makefile.am rename to test/common_plat/validation/api/hash/Makefile.am diff --git a/test/validation/hash/hash.c b/test/common_plat/validation/api/hash/hash.c similarity index 100% rename from test/validation/hash/hash.c rename to test/common_plat/validation/api/hash/hash.c diff --git a/test/validation/hash/hash.h b/test/common_plat/validation/api/hash/hash.h similarity index 100% rename from test/validation/hash/hash.h rename to test/common_plat/validation/api/hash/hash.h diff --git a/test/validation/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c similarity index 100% rename from test/validation/hash/hash_main.c rename to test/common_plat/validation/api/hash/hash_main.c diff --git a/test/validation/init/.gitignore b/test/common_plat/validation/api/init/.gitignore similarity index 100% rename from test/validation/init/.gitignore rename to test/common_plat/validation/api/init/.gitignore diff --git a/test/validation/init/Makefile.am b/test/common_plat/validation/api/init/Makefile.am similarity index 100% rename from test/validation/init/Makefile.am rename to test/common_plat/validation/api/init/Makefile.am diff --git a/test/validation/init/init.c b/test/common_plat/validation/api/init/init.c similarity index 100% rename from test/validation/init/init.c rename to test/common_plat/validation/api/init/init.c diff --git a/test/validation/init/init.h b/test/common_plat/validation/api/init/init.h similarity index 100% rename from test/validation/init/init.h rename to test/common_plat/validation/api/init/init.h diff --git a/test/validation/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c similarity index 100% rename from test/validation/init/init_main_abort.c rename to test/common_plat/validation/api/init/init_main_abort.c diff --git a/test/validation/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c similarity index 100% rename from test/validation/init/init_main_log.c rename to test/common_plat/validation/api/init/init_main_log.c diff --git a/test/validation/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c similarity index 100% rename from test/validation/init/init_main_ok.c rename to test/common_plat/validation/api/init/init_main_ok.c diff --git a/test/validation/lock/.gitignore b/test/common_plat/validation/api/lock/.gitignore similarity index 100% rename from test/validation/lock/.gitignore rename to test/common_plat/validation/api/lock/.gitignore diff --git a/test/validation/lock/Makefile.am b/test/common_plat/validation/api/lock/Makefile.am similarity index 100% rename from test/validation/lock/Makefile.am rename to test/common_plat/validation/api/lock/Makefile.am diff --git a/test/validation/lock/lock.c b/test/common_plat/validation/api/lock/lock.c similarity index 100% rename from test/validation/lock/lock.c rename to test/common_plat/validation/api/lock/lock.c diff --git a/test/validation/lock/lock.h b/test/common_plat/validation/api/lock/lock.h similarity index 100% rename from test/validation/lock/lock.h rename to test/common_plat/validation/api/lock/lock.h diff --git a/test/validation/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c similarity index 100% rename from test/validation/lock/lock_main.c rename to test/common_plat/validation/api/lock/lock_main.c diff --git a/test/validation/packet/.gitignore b/test/common_plat/validation/api/packet/.gitignore similarity index 100% rename from test/validation/packet/.gitignore rename to test/common_plat/validation/api/packet/.gitignore diff --git a/test/validation/packet/Makefile.am b/test/common_plat/validation/api/packet/Makefile.am similarity index 100% rename from test/validation/packet/Makefile.am rename to test/common_plat/validation/api/packet/Makefile.am diff --git a/test/validation/packet/packet.c b/test/common_plat/validation/api/packet/packet.c similarity index 100% rename from test/validation/packet/packet.c rename to test/common_plat/validation/api/packet/packet.c diff --git a/test/validation/packet/packet.h b/test/common_plat/validation/api/packet/packet.h similarity index 100% rename from test/validation/packet/packet.h rename to test/common_plat/validation/api/packet/packet.h diff --git a/test/validation/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c similarity index 100% rename from test/validation/packet/packet_main.c rename to test/common_plat/validation/api/packet/packet_main.c diff --git a/test/validation/pktio/.gitignore b/test/common_plat/validation/api/pktio/.gitignore similarity index 100% rename from test/validation/pktio/.gitignore rename to test/common_plat/validation/api/pktio/.gitignore diff --git a/test/validation/pktio/Makefile.am b/test/common_plat/validation/api/pktio/Makefile.am similarity index 100% rename from test/validation/pktio/Makefile.am rename to test/common_plat/validation/api/pktio/Makefile.am diff --git a/test/validation/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c similarity index 100% rename from test/validation/pktio/pktio.c rename to test/common_plat/validation/api/pktio/pktio.c diff --git a/test/validation/pktio/pktio.h b/test/common_plat/validation/api/pktio/pktio.h similarity index 100% rename from test/validation/pktio/pktio.h rename to test/common_plat/validation/api/pktio/pktio.h diff --git a/test/validation/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c similarity index 100% rename from test/validation/pktio/pktio_main.c rename to test/common_plat/validation/api/pktio/pktio_main.c diff --git a/test/validation/pool/.gitignore b/test/common_plat/validation/api/pool/.gitignore similarity index 100% rename from test/validation/pool/.gitignore rename to test/common_plat/validation/api/pool/.gitignore diff --git a/test/validation/pool/Makefile.am b/test/common_plat/validation/api/pool/Makefile.am similarity index 100% rename from test/validation/pool/Makefile.am rename to test/common_plat/validation/api/pool/Makefile.am diff --git a/test/validation/pool/pool.c b/test/common_plat/validation/api/pool/pool.c similarity index 100% rename from test/validation/pool/pool.c rename to test/common_plat/validation/api/pool/pool.c diff --git a/test/validation/pool/pool.h b/test/common_plat/validation/api/pool/pool.h similarity index 100% rename from test/validation/pool/pool.h rename to test/common_plat/validation/api/pool/pool.h diff --git a/test/validation/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c similarity index 100% rename from test/validation/pool/pool_main.c rename to test/common_plat/validation/api/pool/pool_main.c diff --git a/test/validation/queue/.gitignore b/test/common_plat/validation/api/queue/.gitignore similarity index 100% rename from test/validation/queue/.gitignore rename to test/common_plat/validation/api/queue/.gitignore diff --git a/test/validation/queue/Makefile.am b/test/common_plat/validation/api/queue/Makefile.am similarity index 100% rename from test/validation/queue/Makefile.am rename to test/common_plat/validation/api/queue/Makefile.am diff --git a/test/validation/queue/queue.c b/test/common_plat/validation/api/queue/queue.c similarity index 100% rename from test/validation/queue/queue.c rename to test/common_plat/validation/api/queue/queue.c diff --git a/test/validation/queue/queue.h b/test/common_plat/validation/api/queue/queue.h similarity index 100% rename from test/validation/queue/queue.h rename to test/common_plat/validation/api/queue/queue.h diff --git a/test/validation/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c similarity index 100% rename from test/validation/queue/queue_main.c rename to test/common_plat/validation/api/queue/queue_main.c diff --git a/test/validation/random/.gitignore b/test/common_plat/validation/api/random/.gitignore similarity index 100% rename from test/validation/random/.gitignore rename to test/common_plat/validation/api/random/.gitignore diff --git a/test/validation/random/Makefile.am b/test/common_plat/validation/api/random/Makefile.am similarity index 100% rename from test/validation/random/Makefile.am rename to test/common_plat/validation/api/random/Makefile.am diff --git a/test/validation/random/random.c b/test/common_plat/validation/api/random/random.c similarity index 100% rename from test/validation/random/random.c rename to test/common_plat/validation/api/random/random.c diff --git a/test/validation/random/random.h b/test/common_plat/validation/api/random/random.h similarity index 100% rename from test/validation/random/random.h rename to test/common_plat/validation/api/random/random.h diff --git a/test/validation/random/random_main.c b/test/common_plat/validation/api/random/random_main.c similarity index 100% rename from test/validation/random/random_main.c rename to test/common_plat/validation/api/random/random_main.c diff --git a/test/validation/scheduler/.gitignore b/test/common_plat/validation/api/scheduler/.gitignore similarity index 100% rename from test/validation/scheduler/.gitignore rename to test/common_plat/validation/api/scheduler/.gitignore diff --git a/test/validation/scheduler/Makefile.am b/test/common_plat/validation/api/scheduler/Makefile.am similarity index 100% rename from test/validation/scheduler/Makefile.am rename to test/common_plat/validation/api/scheduler/Makefile.am diff --git a/test/validation/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c similarity index 100% rename from test/validation/scheduler/scheduler.c rename to test/common_plat/validation/api/scheduler/scheduler.c diff --git a/test/validation/scheduler/scheduler.h b/test/common_plat/validation/api/scheduler/scheduler.h similarity index 100% rename from test/validation/scheduler/scheduler.h rename to test/common_plat/validation/api/scheduler/scheduler.h diff --git a/test/validation/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c similarity index 100% rename from test/validation/scheduler/scheduler_main.c rename to test/common_plat/validation/api/scheduler/scheduler_main.c diff --git a/test/validation/shmem/.gitignore b/test/common_plat/validation/api/shmem/.gitignore similarity index 100% rename from test/validation/shmem/.gitignore rename to test/common_plat/validation/api/shmem/.gitignore diff --git a/test/validation/shmem/Makefile.am b/test/common_plat/validation/api/shmem/Makefile.am similarity index 100% rename from test/validation/shmem/Makefile.am rename to test/common_plat/validation/api/shmem/Makefile.am diff --git a/test/validation/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c similarity index 100% rename from test/validation/shmem/shmem.c rename to test/common_plat/validation/api/shmem/shmem.c diff --git a/test/validation/shmem/shmem.h b/test/common_plat/validation/api/shmem/shmem.h similarity index 100% rename from test/validation/shmem/shmem.h rename to test/common_plat/validation/api/shmem/shmem.h diff --git a/test/validation/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c similarity index 100% rename from test/validation/shmem/shmem_main.c rename to test/common_plat/validation/api/shmem/shmem_main.c diff --git a/test/validation/std_clib/.gitignore b/test/common_plat/validation/api/std_clib/.gitignore similarity index 100% rename from test/validation/std_clib/.gitignore rename to test/common_plat/validation/api/std_clib/.gitignore diff --git a/test/validation/std_clib/Makefile.am b/test/common_plat/validation/api/std_clib/Makefile.am similarity index 100% rename from test/validation/std_clib/Makefile.am rename to test/common_plat/validation/api/std_clib/Makefile.am diff --git a/test/validation/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c similarity index 100% rename from test/validation/std_clib/std_clib.c rename to test/common_plat/validation/api/std_clib/std_clib.c diff --git a/test/validation/std_clib/std_clib.h b/test/common_plat/validation/api/std_clib/std_clib.h similarity index 100% rename from test/validation/std_clib/std_clib.h rename to test/common_plat/validation/api/std_clib/std_clib.h diff --git a/test/validation/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c similarity index 100% rename from test/validation/std_clib/std_clib_main.c rename to test/common_plat/validation/api/std_clib/std_clib_main.c diff --git a/test/validation/system/.gitignore b/test/common_plat/validation/api/system/.gitignore similarity index 100% rename from test/validation/system/.gitignore rename to test/common_plat/validation/api/system/.gitignore diff --git a/test/validation/system/Makefile.am b/test/common_plat/validation/api/system/Makefile.am similarity index 100% rename from test/validation/system/Makefile.am rename to test/common_plat/validation/api/system/Makefile.am diff --git a/test/validation/system/system.c b/test/common_plat/validation/api/system/system.c similarity index 100% rename from test/validation/system/system.c rename to test/common_plat/validation/api/system/system.c diff --git a/test/validation/system/system.h b/test/common_plat/validation/api/system/system.h similarity index 100% rename from test/validation/system/system.h rename to test/common_plat/validation/api/system/system.h diff --git a/test/validation/system/system_main.c b/test/common_plat/validation/api/system/system_main.c similarity index 100% rename from test/validation/system/system_main.c rename to test/common_plat/validation/api/system/system_main.c diff --git a/test/validation/thread/.gitignore b/test/common_plat/validation/api/thread/.gitignore similarity index 100% rename from test/validation/thread/.gitignore rename to test/common_plat/validation/api/thread/.gitignore diff --git a/test/validation/thread/Makefile.am b/test/common_plat/validation/api/thread/Makefile.am similarity index 100% rename from test/validation/thread/Makefile.am rename to test/common_plat/validation/api/thread/Makefile.am diff --git a/test/validation/thread/thread.c b/test/common_plat/validation/api/thread/thread.c similarity index 100% rename from test/validation/thread/thread.c rename to test/common_plat/validation/api/thread/thread.c diff --git a/test/validation/thread/thread.h b/test/common_plat/validation/api/thread/thread.h similarity index 100% rename from test/validation/thread/thread.h rename to test/common_plat/validation/api/thread/thread.h diff --git a/test/validation/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c similarity index 100% rename from test/validation/thread/thread_main.c rename to test/common_plat/validation/api/thread/thread_main.c diff --git a/test/validation/time/.gitignore b/test/common_plat/validation/api/time/.gitignore similarity index 100% rename from test/validation/time/.gitignore rename to test/common_plat/validation/api/time/.gitignore diff --git a/test/validation/time/Makefile.am b/test/common_plat/validation/api/time/Makefile.am similarity index 100% rename from test/validation/time/Makefile.am rename to test/common_plat/validation/api/time/Makefile.am diff --git a/test/validation/time/time.c b/test/common_plat/validation/api/time/time.c similarity index 100% rename from test/validation/time/time.c rename to test/common_plat/validation/api/time/time.c diff --git a/test/validation/time/time.h b/test/common_plat/validation/api/time/time.h similarity index 100% rename from test/validation/time/time.h rename to test/common_plat/validation/api/time/time.h diff --git a/test/validation/time/time_main.c b/test/common_plat/validation/api/time/time_main.c similarity index 100% rename from test/validation/time/time_main.c rename to test/common_plat/validation/api/time/time_main.c diff --git a/test/validation/timer/.gitignore b/test/common_plat/validation/api/timer/.gitignore similarity index 100% rename from test/validation/timer/.gitignore rename to test/common_plat/validation/api/timer/.gitignore diff --git a/test/validation/timer/Makefile.am b/test/common_plat/validation/api/timer/Makefile.am similarity index 100% rename from test/validation/timer/Makefile.am rename to test/common_plat/validation/api/timer/Makefile.am diff --git a/test/validation/timer/timer.c b/test/common_plat/validation/api/timer/timer.c similarity index 100% rename from test/validation/timer/timer.c rename to test/common_plat/validation/api/timer/timer.c diff --git a/test/validation/timer/timer.h b/test/common_plat/validation/api/timer/timer.h similarity index 100% rename from test/validation/timer/timer.h rename to test/common_plat/validation/api/timer/timer.h diff --git a/test/validation/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c similarity index 100% rename from test/validation/timer/timer_main.c rename to test/common_plat/validation/api/timer/timer_main.c diff --git a/test/validation/traffic_mngr/.gitignore b/test/common_plat/validation/api/traffic_mngr/.gitignore similarity index 100% rename from test/validation/traffic_mngr/.gitignore rename to test/common_plat/validation/api/traffic_mngr/.gitignore diff --git a/test/validation/traffic_mngr/Makefile.am b/test/common_plat/validation/api/traffic_mngr/Makefile.am similarity index 100% rename from test/validation/traffic_mngr/Makefile.am rename to test/common_plat/validation/api/traffic_mngr/Makefile.am diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.c diff --git a/test/validation/traffic_mngr/traffic_mngr.h b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr.h rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr.h diff --git a/test/validation/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c similarity index 100% rename from test/validation/traffic_mngr/traffic_mngr_main.c rename to test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 5a74809..460e844 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -1,32 +1,3 @@ -m4_include([test/m4/miscellaneous.m4]) -m4_include([test/m4/performance.m4]) -m4_include([test/m4/validation.m4]) +m4_include([test/common_plat/m4/configure.m4])

-AC_CONFIG_FILES([test/Makefile - test/miscellaneous/Makefile - test/performance/Makefile - test/validation/atomic/Makefile - test/validation/barrier/Makefile - test/validation/buffer/Makefile - test/validation/classification/Makefile - test/validation/common/Makefile - test/validation/cpumask/Makefile - test/validation/crypto/Makefile - test/validation/errno/Makefile - test/validation/hash/Makefile - test/validation/init/Makefile - test/validation/lock/Makefile - test/validation/Makefile - test/validation/packet/Makefile - test/validation/pktio/Makefile - test/validation/pool/Makefile - test/validation/queue/Makefile - test/validation/random/Makefile - test/validation/scheduler/Makefile - test/validation/shmem/Makefile - test/validation/std_clib/Makefile - test/validation/system/Makefile - test/validation/thread/Makefile - test/validation/time/Makefile - test/validation/timer/Makefile - test/validation/traffic_mngr/Makefile]) +AC_CONFIG_FILES([test/Makefile]) diff --git a/test/platform/linux-generic/Makefile.am b/test/platform/linux-generic/Makefile.am index 2d58c57..83da140 100644 --- a/test/platform/linux-generic/Makefile.am +++ b/test/platform/linux-generic/Makefile.am @@ -1,39 +1,41 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation

ODP_MODULES = pktio \ ring \ shmem

+ALL_API_VALIDATION_DIR = ${top_builddir}/test/common_plat/validation/api + if test_vald TESTS = pktio/pktio_run.sh \ pktio/pktio_run_tap.sh \ ring/ring_main$(EXEEXT) \ shmem/shmem_linux \ - ${top_builddir}/test/validation/atomic/atomic_main$(EXEEXT) \ - ${top_builddir}/test/validation/barrier/barrier_main$(EXEEXT) \ - ${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \ - ${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \ - ${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \ - ${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \ - ${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \ - ${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \ - ${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \ - ${top_builddir}/test/validation/lock/lock_main$(EXEEXT) \ - ${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \ - ${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \ - ${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \ - ${top_builddir}/test/validation/random/random_main$(EXEEXT) \ - ${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \ - ${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \ - ${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \ - ${top_builddir}/test/validation/time/time_main$(EXEEXT) \ - ${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \ - ${top_builddir}/test/validation/traffic_mngr/traffic_mngr_main$(EXEEXT) \ - ${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \ - ${top_builddir}/test/validation/system/system_main$(EXEEXT) + $(ALL_API_VALIDATION_DIR)/atomic/atomic_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/barrier/barrier_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/buffer/buffer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/classification/classification_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/cpumask/cpumask_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/crypto/crypto_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/errno/errno_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/hash/hash_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_ok$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_abort$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/init/init_main_log$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/lock/lock_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/packet/packet_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/pool/pool_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/queue/queue_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/random/random_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/scheduler/scheduler_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/std_clib/std_clib_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/thread/thread_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/time/time_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/timer/timer_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/traffic_mngr/traffic_mngr_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/shmem/shmem_main$(EXEEXT) \ + $(ALL_API_VALIDATION_DIR)/system/system_main$(EXEEXT)

SUBDIRS = $(ODP_MODULES)

diff --git a/test/platform/linux-generic/Makefile.inc b/test/platform/linux-generic/Makefile.inc index 80b66ae..b26324f 100644 --- a/test/platform/linux-generic/Makefile.inc +++ b/test/platform/linux-generic/Makefile.inc @@ -4,11 +4,11 @@

AM_LDFLAGS += -static

-LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la +LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la

-INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common +INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ diff --git a/test/platform/linux-generic/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh index 1dc1f44..0905b8b 100755 --- a/test/platform/linux-generic/pktio/pktio_run.sh +++ b/test/platform/linux-generic/pktio/pktio_run.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh index fd552c6..4d16b29 100755 --- a/test/platform/linux-generic/pktio/pktio_run_dpdk.sh +++ b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh @@ -21,9 +21,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh index b651ea3..6fd271b 100755 --- a/test/platform/linux-generic/pktio/pktio_run_netmap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_netmap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone (./pktio_run) intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh index 51716fb..721141a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_pcap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_pcap.sh @@ -15,9 +15,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/platform/linux-generic/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh index 1150158..96f6d5a 100755 --- a/test/platform/linux-generic/pktio/pktio_run_tap.sh +++ b/test/platform/linux-generic/pktio/pktio_run_tap.sh @@ -16,9 +16,9 @@ # -in the validation when running standalone intree. # -in the current directory. # running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/pktio:$PATH +PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=$(dirname $0)/../../../../test/validation/api/pktio:$PATH PATH=.:$PATH

pktio_main_path=$(which pktio_main${EXEEXT})

commit c79b041f389e56a2c713a507b75762e08d75e4b4 Author: Christophe Milard christophe.milard@linaro.org Date: Wed Jul 13 21:50:40 2016 +0200

validation: diverse cosmetic fixes for checkpatch

To reduce the number of issues picked up by check-odp when moving the files in next patch

Signed-off-by: Christophe Milard christophe.milard@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-and-tested-by: Yi He yi.he@linaro.org Reviewed-by: Mike Holmes mike.holmes@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index b7818ea..49a9f4b 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -552,11 +552,9 @@ run_measure_one(crypto_args_t *cargs, if (newpkt == ODP_PACKET_INVALID) { app_err("failed to allocate buffer\n"); return -1; - } else { - void *mem = odp_packet_data(pkt); - - memset(mem, 1, payload_length); } + mem = odp_packet_data(newpkt); + memset(mem, 1, payload_length); params.pkt = newpkt; params.out_pkt = cargs->in_place ? newpkt : ODP_PACKET_INVALID; diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index f05aa30..418382d 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -80,7 +80,6 @@ static inline int sched_mode(pktin_mode_t in_mode) (in_mode == SCHED_ORDERED); }

- /** Get rid of path in filename - only for unix-type paths using '/' */ #define NO_PATH(file_name) (strrchr((file_name), '/') ? \ strrchr((file_name), '/') + 1 : (file_name)) diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh index fc3d05d..1fff087 100755 --- a/test/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -65,7 +65,8 @@ run_l2fwd() #@todo: limit odp_generator to cores #https://bugs.linaro.org/show_bug.cgi?id=1398 (odp_generator${EXEEXT} -I $IF0 \ - --srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1 > /dev/null) \ + --srcip 192.168.0.1 --dstip 192.168.0.2 \ + -m u 2>&1 > /dev/null) \ 2>&1 > /dev/null & GEN_PID=$!

diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index 18a1aa2..f041b13 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -255,7 +255,6 @@ static int pktio_pkt_has_magic(odp_packet_t pkt) return 0; }

- /* * Allocate packets for transmission. */ @@ -375,8 +374,8 @@ static int run_thread_tx(void *arg) cur_time = odp_time_local(); }

- VPRINT(" %02d: TxPkts %-8"PRIu64" EnqFail %-6"PRIu64 - " AllocFail %-6"PRIu64" Idle %"PRIu64"ms\n", + VPRINT(" %02d: TxPkts %-8" PRIu64 " EnqFail %-6" PRIu64 + " AllocFail %-6" PRIu64 " Idle %" PRIu64 "ms\n", thr_id, stats->s.tx_cnt, stats->s.enq_failures, stats->s.alloc_failures, odp_time_to_ns(stats->s.idle_ticks) / @@ -417,6 +416,7 @@ static int run_thread_rx(void *arg) test_globals_t *globals; int thr_id, batch_len; odp_queue_t queue = ODP_QUEUE_INVALID; + odp_packet_t pkt;

thread_args_t *targs = arg;

@@ -445,7 +445,7 @@ static int run_thread_rx(void *arg)

for (i = 0; i < n_ev; ++i) { if (odp_event_type(ev[i]) == ODP_EVENT_PACKET) { - odp_packet_t pkt = odp_packet_from_event(ev[i]); + pkt = odp_packet_from_event(ev[i]); if (pktio_pkt_has_magic(pkt)) stats->s.rx_cnt++; else @@ -498,16 +498,16 @@ static int process_results(uint64_t expected_tx_cnt,

attempted_pps = status->pps_curr;

- len += snprintf(&str[len], sizeof(str)-1-len, - "PPS: %-8"PRIu64" ", attempted_pps); - len += snprintf(&str[len], sizeof(str)-1-len, + len += snprintf(&str[len], sizeof(str) - 1 - len, + "PPS: %-8" PRIu64 " ", attempted_pps); + len += snprintf(&str[len], sizeof(str) - 1 - len, "Succeeded: %-4s ", fail ? "No" : "Yes"); - len += snprintf(&str[len], sizeof(str)-1-len, - "TxPkts: %-8"PRIu64" ", tx_pkts); - len += snprintf(&str[len], sizeof(str)-1-len, - "RxPkts: %-8"PRIu64" ", rx_pkts); - len += snprintf(&str[len], sizeof(str)-1-len, - "DropPkts: %-8"PRIu64" ", drops); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "TxPkts: %-8" PRIu64 " ", tx_pkts); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "RxPkts: %-8" PRIu64 " ", rx_pkts); + len += snprintf(&str[len], sizeof(str) - 1 - len, + "DropPkts: %-8" PRIu64 " ", drops); printf("%s\n", str);

if (gbl_args->args.search == 0) { @@ -537,7 +537,7 @@ static int process_results(uint64_t expected_tx_cnt, unsigned pkt_len = gbl_args->args.pkt_len + PKT_HDR_LEN; int mbps = (pkt_len * status->pps_pass * 8) / 1024 / 1024;

- printf("Maximum packet rate: %"PRIu64" PPS (%d Mbps)\n", + printf("Maximum packet rate: %" PRIu64 " PPS (%d Mbps)\n", status->pps_pass, mbps);

return 0; @@ -587,8 +587,8 @@ static int setup_txrx_masks(odp_cpumask_t *thd_mask_tx,

num_rx_workers = odp_cpumask_count(thd_mask_rx);

- odp_barrier_init(&gbl_args->rx_barrier, num_rx_workers+1); - odp_barrier_init(&gbl_args->tx_barrier, num_tx_workers+1); + odp_barrier_init(&gbl_args->rx_barrier, num_rx_workers + 1); + odp_barrier_init(&gbl_args->tx_barrier, num_tx_workers + 1);

return 0; } @@ -978,7 +978,7 @@ static void parse_args(int argc, char *argv[], test_args_t *args) { char *token;

- args->if_str = malloc(strlen(optarg)+1); + args->if_str = malloc(strlen(optarg) + 1);

if (!args->if_str) LOG_ABORT("Failed to alloc iface storage\n"); diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index bd37f9b..5a2997f 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -28,12 +28,12 @@ /* GNU lib C */ #include <getopt.h>

-#define MSG_POOL_SIZE (4*1024*1024) /**< Message pool size */ +#define MSG_POOL_SIZE (4 * 1024 * 1024) /**< Message pool size */ #define MAX_ALLOCS 35 /**< Alloc burst size */ #define QUEUES_PER_PRIO 64 /**< Queue per priority */ #define NUM_PRIOS 2 /**< Number of tested priorities */ -#define QUEUE_ROUNDS (512*1024) /**< Queue test rounds */ -#define ALLOC_ROUNDS (1024*1024) /**< Alloc test rounds */ +#define QUEUE_ROUNDS (512 * 1024) /**< Queue test rounds */ +#define ALLOC_ROUNDS (1024 * 1024) /**< Alloc test rounds */ #define MULTI_BUFS_MAX 4 /**< Buffer burst size */ #define TEST_SEC 2 /**< Time test duration in sec */ #define STATS_PER_LINE 8 /**< Stats per printed line */ @@ -163,7 +163,6 @@ static int enqueue_events(int thr, int prio, int num_queues, int num_events, return 0; }

- /** * @internal Test single buffer alloc and free * @@ -228,7 +227,7 @@ static int test_alloc_multi(int thr, test_globals_t *globals) }

for (; j > 0; j--) - odp_buffer_free(temp_buf[j-1]); + odp_buffer_free(temp_buf[j - 1]); }

c2 = odp_cpu_cycles(); @@ -385,7 +384,6 @@ static int test_schedule_single(const char *str, int thr, return 0; }

- /** * @internal Test scheduling of multiple queues - with odp_schedule() * @@ -533,7 +531,6 @@ static int test_schedule_multi(const char *str, int thr,

odp_schedule_resume();

- c2 = odp_cpu_cycles(); cycles = odp_cpu_cycles_diff(c2, c1);

@@ -655,7 +652,6 @@ static int run_thread(void *arg ODP_UNUSED) ODP_SCHED_PRIO_HIGHEST, globals)) return -1;

- printf("Thread %i exits\n", thr); fflush(NULL); return 0; @@ -768,7 +764,6 @@ static void parse_args(int argc, char *argv[], test_args_t *args) } }

- /** * Test main function */ @@ -857,7 +852,7 @@ int main(int argc, char *argv[]) odp_pool_param_init(&params); params.buf.size = sizeof(test_message_t); params.buf.align = 0; - params.buf.num = MSG_POOL_SIZE/sizeof(test_message_t); + params.buf.num = MSG_POOL_SIZE / sizeof(test_message_t); params.type = ODP_POOL_BUFFER;

pool = odp_pool_create("msg_pool", &params); @@ -905,8 +900,8 @@ int main(int argc, char *argv[]) param.sched.group = ODP_SCHED_GROUP_ALL;

for (j = 0; j < QUEUES_PER_PRIO; j++) { - name[9] = '0' + j/10; - name[10] = '0' + j - 10*(j/10); + name[9] = '0' + j / 10; + name[10] = '0' + j - 10 * (j / 10);

queue = odp_queue_create(name, &param);

diff --git a/test/validation/classification/odp_classification_test_pmr.c b/test/validation/classification/odp_classification_test_pmr.c index 7c7d07e..c8bbf50 100644 --- a/test/validation/classification/odp_classification_test_pmr.c +++ b/test/validation/classification/odp_classification_test_pmr.c @@ -70,7 +70,6 @@ void configure_default_cos(odp_pktio_t pktio, odp_cos_t *cos, *cos = default_cos; *queue = default_queue; *pool = default_pool; - return; }

int classification_suite_pmr_term(void) diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/validation/crypto/odp_crypto_test_inp.c index 0c5b110..4ac4a07 100644 --- a/test/validation/crypto/odp_crypto_test_inp.c +++ b/test/validation/crypto/odp_crypto_test_inp.c @@ -53,6 +53,10 @@ static void alg_test(odp_crypto_op_t op, odp_event_t event; odp_crypto_compl_t compl_event; odp_crypto_op_result_t result; + odp_crypto_session_params_t ses_params; + odp_crypto_op_params_t op_params; + uint8_t *data_addr; + int data_off;

rc = odp_crypto_capability(&capability); CU_ASSERT(!rc); @@ -100,7 +104,6 @@ static void alg_test(odp_crypto_op_t op, CU_ASSERT(!rc);

/* Create a crypto session */ - odp_crypto_session_params_t ses_params; memset(&ses_params, 0, sizeof(ses_params)); ses_params.op = op; ses_params.auth_cipher_text = false; @@ -123,12 +126,11 @@ static void alg_test(odp_crypto_op_t op, odp_packet_t pkt = odp_packet_alloc(suite_context.pool, plaintext_len + digest_len); CU_ASSERT(pkt != ODP_PACKET_INVALID); - uint8_t *data_addr = odp_packet_data(pkt); + data_addr = odp_packet_data(pkt); memcpy(data_addr, plaintext, plaintext_len); - int data_off = 0; + data_off = 0;

/* Prepare input/output params */ - odp_crypto_op_params_t op_params; memset(&op_params, 0, sizeof(op_params)); op_params.session = session; op_params.pkt = pkt; @@ -199,10 +201,10 @@ void crypto_test_enc_alg_3des_cbc(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -232,10 +234,10 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = TDES_CBC_IV_LEN }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -255,7 +257,6 @@ void crypto_test_enc_alg_3des_cbc_ovr_iv(void) } }

- /* This test verifies the correctness of decode (ciphertext -> plaintext) * operation for 3DES_CBC algorithm. IV for the operation is the session IV * In addition the test verifies if the implementation can use the @@ -266,10 +267,10 @@ void crypto_test_dec_alg_3des_cbc(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = 0 }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -301,10 +302,10 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void) odp_crypto_key_t cipher_key = { .data = NULL, .length = 0 }, auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = TDES_CBC_IV_LEN }; - unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length)/ + unsigned int test_vec_num = (sizeof(tdes_cbc_reference_length) / sizeof(tdes_cbc_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { cipher_key.data = tdes_cbc_reference_key[i]; cipher_key.length = sizeof(tdes_cbc_reference_key[i]); @@ -607,7 +608,6 @@ void crypto_test_dec_alg_aes128_cbc_ovr_iv(void) } }

- /* This test verifies the correctness of HMAC_MD5 digest operation. * The output check length is truncated to 12 bytes (96 bits) as * returned by the crypto operation API call. @@ -621,10 +621,10 @@ void crypto_test_alg_hmac_md5(void) auth_key = { .data = NULL, .length = 0 }; odp_crypto_iv_t iv = { .data = NULL, .length = 0 };

- unsigned int test_vec_num = (sizeof(hmac_md5_reference_length)/ + unsigned int test_vec_num = (sizeof(hmac_md5_reference_length) / sizeof(hmac_md5_reference_length[0])); - unsigned int i; + for (i = 0; i < test_vec_num; i++) { auth_key.data = hmac_md5_reference_key[i]; auth_key.length = sizeof(hmac_md5_reference_key[i]); diff --git a/test/validation/crypto/test_vectors.h b/test/validation/crypto/test_vectors.h index 1b760a2..da4610f 100644 --- a/test/validation/crypto/test_vectors.h +++ b/test/validation/crypto/test_vectors.h @@ -266,7 +266,7 @@ aes128_gcm_reference_ciphertext[][AES128_GCM_MAX_DATA_LEN] = {

static uint8_t hmac_md5_reference_key[][HMAC_MD5_KEY_LEN] = { { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, - 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b } , + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b },

/* "Jefe" */ { 0x4a, 0x65, 0x66, 0x65 }, diff --git a/test/validation/hash/hash.c b/test/validation/hash/hash.c index feaa6ae..b353fce 100644 --- a/test/validation/hash/hash.c +++ b/test/validation/hash/hash.c @@ -51,5 +51,4 @@ int hash_main(int argc, char *argv[]) ret = odp_cunit_run();

return ret; - } diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index d53a419..a6a18c3 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -1547,7 +1547,6 @@ void pktio_test_start_stop(void)

/* Test Rx on a stopped interface. Only works if there are 2 */ if (num_ifaces > 1) { - alloc = create_packets(tx_pkt, pkt_seq, 1000, pktio[0], pktio[1]);

@@ -1591,7 +1590,6 @@ void pktio_test_start_stop(void) } }

- if (num_ifaces > 1) pktio_in = pktio[1]; else diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c index 96941f4..dc3a977 100644 --- a/test/validation/queue/queue.c +++ b/test/validation/queue/queue.c @@ -148,6 +148,7 @@ void queue_test_param(void) int nr_deq_entries = 0; int max_iteration = CONFIG_MAX_ITERATION; odp_queue_param_t qparams; + odp_buffer_t enbuf;

/* Schedule type queue */ odp_queue_param_init(&qparams); @@ -197,7 +198,7 @@ void queue_test_param(void) }

for (i = 0; i < MAX_BUFFER_QUEUE; i++) { - odp_buffer_t buf = odp_buffer_alloc(msg_pool); + buf = odp_buffer_alloc(msg_pool); enev[i] = odp_buffer_to_event(buf); }

@@ -223,7 +224,7 @@ void queue_test_param(void) } while (nr_deq_entries < MAX_BUFFER_QUEUE);

for (i = 0; i < MAX_BUFFER_QUEUE; i++) { - odp_buffer_t enbuf = odp_buffer_from_event(enev[i]); + enbuf = odp_buffer_from_event(enev[i]); CU_ASSERT(enev[i] == deev[i]); odp_buffer_free(enbuf); } @@ -283,7 +284,7 @@ void queue_test_info(void) CU_ASSERT(info.param.sched.group == odp_queue_sched_group(q_order)); ret = odp_queue_lock_count(q_order); CU_ASSERT(ret >= 0); - lock_count = (unsigned) ret; + lock_count = (unsigned)ret; CU_ASSERT(info.param.sched.lock_count == lock_count);

CU_ASSERT(odp_queue_destroy(q_plain) == 0); diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c index 316370d..919cfb6 100644 --- a/test/validation/scheduler/scheduler.c +++ b/test/validation/scheduler/scheduler.c @@ -676,6 +676,9 @@ static int schedule_common_(void *arg) odp_pool_t pool; int locked; int num; + odp_event_t ev; + odp_buffer_t buf, buf_cpy; + odp_queue_t from;

globals = args->globals; sync = args->sync; @@ -687,9 +690,7 @@ static int schedule_common_(void *arg) odp_barrier_wait(&globals->barrier);

while (1) { - odp_event_t ev; - odp_buffer_t buf, buf_cpy; - odp_queue_t from = ODP_QUEUE_INVALID; + from = ODP_QUEUE_INVALID; num = 0;

odp_ticketlock_lock(&globals->lock); @@ -902,6 +903,8 @@ static void fill_queues(thread_args_t *args) test_globals_t *globals; char name[32]; int ret; + odp_buffer_t buf; + odp_event_t ev;

globals = args->globals; sync = args->sync; @@ -937,8 +940,6 @@ static void fill_queues(thread_args_t *args) CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID);

for (k = 0; k < args->num_bufs; k++) { - odp_buffer_t buf; - odp_event_t ev; buf = odp_buffer_alloc(pool); CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); ev = odp_buffer_to_event(buf); @@ -1332,6 +1333,7 @@ static int create_queues(void) odp_buffer_t queue_ctx_buf; queue_context *qctx, *pqctx; uint32_t ndx; + odp_queue_param_t p;

if (odp_queue_capability(&capa) < 0) { printf("Queue capability query failed\n"); @@ -1359,7 +1361,6 @@ static int create_queues(void) }

for (i = 0; i < prios; i++) { - odp_queue_param_t p; odp_queue_param_init(&p); p.type = ODP_QUEUE_TYPE_SCHED; p.sched.prio = i; diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c index 33eb478..0007639 100644 --- a/test/validation/timer/timer.c +++ b/test/validation/timer/timer.c @@ -251,7 +251,8 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) CU_FAIL("Wrong status (stale) for fresh timeout"); /* Fresh timeout => local timer must have matching tick */ if (ttp && ttp->tick != tick) { - LOG_DBG("Wrong tick: expected %" PRIu64 " actual %" PRIu64 "\n", + LOG_DBG("Wrong tick: expected %" PRIu64 + " actual %" PRIu64 "\n", ttp->tick, tick); CU_FAIL("odp_timeout_tick() wrong tick"); } @@ -259,7 +260,8 @@ static void handle_tmo(odp_event_t ev, bool stale, uint64_t prev_tick) if (tick > odp_timer_current_tick(tp)) CU_FAIL("Timeout delivered early"); if (tick < prev_tick) { - LOG_DBG("Too late tick: %" PRIu64 " prev_tick %" PRIu64"\n", + LOG_DBG("Too late tick: %" PRIu64 + " prev_tick %" PRIu64"\n", tick, prev_tick); /* We don't report late timeouts using CU_FAIL */ odp_atomic_inc_u32(&ndelivtoolate); @@ -281,12 +283,26 @@ static int worker_entrypoint(void *arg TEST_UNUSED) uint32_t i, allocated; unsigned seed = thr; int rc; + odp_queue_t queue; + struct test_timer *tt; + uint32_t nset; + uint64_t tck; + uint32_t nrcv; + uint32_t nreset; + uint32_t ncancel; + uint32_t ntoolate; + uint32_t ms; + uint64_t prev_tick; + odp_event_t ev; + struct timespec ts; + uint32_t nstale; + odp_timer_set_t timer_rc;

- odp_queue_t queue = odp_queue_create("timer_queue", NULL); + queue = odp_queue_create("timer_queue", NULL); if (queue == ODP_QUEUE_INVALID) CU_FAIL_FATAL("Queue create failed");

- struct test_timer *tt = malloc(sizeof(struct test_timer) * NTIMERS); + tt = malloc(sizeof(struct test_timer) * NTIMERS); if (!tt) CU_FAIL_FATAL("malloc failed");

@@ -316,15 +332,13 @@ static int worker_entrypoint(void *arg TEST_UNUSED) odp_barrier_wait(&test_barrier);

/* Initial set all timers with a random expiration time */ - uint32_t nset = 0; + nset = 0; for (i = 0; i < allocated; i++) { - uint64_t tck = odp_timer_current_tick(tp) + 1 + - odp_timer_ns_to_tick(tp, - (rand_r(&seed) % RANGE_MS) - * 1000000ULL); - odp_timer_set_t rc; - rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); - if (rc != ODP_TIMER_SUCCESS) { + tck = odp_timer_current_tick(tp) + 1 + + odp_timer_ns_to_tick(tp, (rand_r(&seed) % RANGE_MS) + * 1000000ULL); + timer_rc = odp_timer_set_abs(tt[i].tim, tck, &tt[i].ev); + if (timer_rc != ODP_TIMER_SUCCESS) { CU_FAIL("Failed to set timer"); } else { tt[i].tick = tck; @@ -333,15 +347,13 @@ static int worker_entrypoint(void *arg TEST_UNUSED) }

/* Step through wall time, 1ms at a time and check for expired timers */ - uint32_t nrcv = 0; - uint32_t nreset = 0; - uint32_t ncancel = 0; - uint32_t ntoolate = 0; - uint32_t ms; - uint64_t prev_tick = odp_timer_current_tick(tp); + nrcv = 0; + nreset = 0; + ncancel = 0; + ntoolate = 0; + prev_tick = odp_timer_current_tick(tp);

for (ms = 0; ms < 7 * RANGE_MS / 10 && allocated > 0; ms++) { - odp_event_t ev; while ((ev = odp_queue_deq(queue)) != ODP_EVENT_INVALID) { /* Subtract one from prev_tick to allow for timeouts * to be delivered a tick late */ @@ -388,7 +400,6 @@ static int worker_entrypoint(void *arg TEST_UNUSED) tt[i].tick = cur_tick + tck; } } - struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = 1000000; /* 1ms */ if (nanosleep(&ts, NULL) < 0) @@ -396,7 +407,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) }

/* Cancel and free all timers */ - uint32_t nstale = 0; + nstale = 0; for (i = 0; i < allocated; i++) { (void)odp_timer_cancel(tt[i].tim, &tt[i].ev); tt[i].tick = TICK_INVALID; @@ -412,22 +423,22 @@ static int worker_entrypoint(void *arg TEST_UNUSED) LOG_DBG("Thread %u: %" PRIu32 " timers reset/cancelled too late\n", thr, ntoolate); LOG_DBG("Thread %u: %" PRIu32 " timeouts received\n", thr, nrcv); - LOG_DBG("Thread %u: %" PRIu32 " stale timeout(s) after odp_timer_free()\n", + LOG_DBG("Thread %u: %" PRIu32 + " stale timeout(s) after odp_timer_free()\n", thr, nstale);

/* Delay some more to ensure timeouts for expired timers can be * received. Can not use busy loop here to make background timer * thread finish their work. */ - struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = (3 * RANGE_MS / 10 + 50) * ODP_TIME_MSEC_IN_NS; if (nanosleep(&ts, NULL) < 0) CU_FAIL_FATAL("nanosleep failed");

while (nstale != 0) { - odp_event_t ev = odp_queue_deq(queue); + ev = odp_queue_deq(queue); if (ev != ODP_EVENT_INVALID) { - handle_tmo(ev, true, 0/*Dont' care for stale tmo's*/); + handle_tmo(ev, true, 0/*Don't care for stale tmo's*/); nstale--; } else { CU_FAIL("Failed to receive stale timeout"); @@ -441,7 +452,7 @@ static int worker_entrypoint(void *arg TEST_UNUSED) }

/* Check if there any more (unexpected) events */ - odp_event_t ev = odp_queue_deq(queue); + ev = odp_queue_deq(queue); if (ev != ODP_EVENT_INVALID) CU_FAIL("Unexpected event received");

@@ -464,6 +475,11 @@ void timer_test_odp_timer_all(void) odp_pool_param_t params; odp_timer_pool_param_t tparam; odp_cpumask_t unused; + odp_timer_pool_info_t tpinfo; + uint64_t tick; + uint64_t ns; + uint64_t t2; + pthrd_arg thrdarg;

/* Reserve at least one core for running other processes so the timer * test hopefully can run undisturbed and thus get better timing @@ -505,7 +521,6 @@ void timer_test_odp_timer_all(void) /* Start all created timer pools */ odp_timer_pool_start();

- odp_timer_pool_info_t tpinfo; if (odp_timer_pool_info(tp, &tpinfo) != 0) CU_FAIL("odp_timer_pool_info"); CU_ASSERT(strcmp(tpinfo.name, NAME) == 0); @@ -519,10 +534,9 @@ void timer_test_odp_timer_all(void) LOG_DBG("Tmo range: %u ms (%" PRIu64 " ticks)\n", RANGE_MS, odp_timer_ns_to_tick(tp, 1000000ULL * RANGE_MS));

- uint64_t tick; for (tick = 0; tick < 1000000000000ULL; tick += 1000000ULL) { - uint64_t ns = odp_timer_tick_to_ns(tp, tick); - uint64_t t2 = odp_timer_ns_to_tick(tp, ns); + ns = odp_timer_tick_to_ns(tp, tick); + t2 = odp_timer_ns_to_tick(tp, ns); if (tick != t2) CU_FAIL("Invalid conversion tick->ns->tick"); } @@ -537,7 +551,6 @@ void timer_test_odp_timer_all(void) odp_atomic_init_u32(&timers_allocated, 0);

/* Create and start worker threads */ - pthrd_arg thrdarg; thrdarg.testcase = 0; thrdarg.numthrds = num_workers; odp_cunit_thread_create(worker_entrypoint, &thrdarg);

-----------------------------------------------------------------------

Summary of changes: configure.ac | 2 +- doc/implementers-guide/implementers-guide.adoc | 137 ++++++++++++--------- test/Makefile.am | 6 +- test/common_plat/Makefile.am | 7 ++ .../{validation => common_plat}/common/Makefile.am | 0 .../common/mask_common.c | 0 .../common/mask_common.h | 0 .../common/odp_cunit_common.c | 0 .../common/odp_cunit_common.h | 0 test/common_plat/m4/configure.m4 | 33 +++++ test/{ => common_plat}/m4/miscellaneous.m4 | 0 test/{ => common_plat}/m4/performance.m4 | 0 test/{ => common_plat}/m4/validation.m4 | 0 test/{ => common_plat}/miscellaneous/.gitignore | 0 test/{ => common_plat}/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{ => common_plat}/performance/.gitignore | 0 test/{ => common_plat}/performance/Makefile.am | 0 test/{ => common_plat}/performance/odp_crypto.c | 6 +- test/{ => common_plat}/performance/odp_l2fwd.c | 1 - .../{ => common_plat}/performance/odp_l2fwd_run.sh | 11 +- .../{ => common_plat}/performance/odp_pktio_perf.c | 34 ++--- .../{ => common_plat}/performance/odp_scheduling.c | 19 ++- .../performance/odp_scheduling_run.sh | 0 test/common_plat/validation/Makefile.am | 3 + .../validation/api}/.gitignore | 0 .../validation/api}/Makefile.am | 2 +- .../validation/api}/Makefile.inc | 4 +- .../validation/api}/README | 0 .../validation/api}/atomic/.gitignore | 0 .../validation/api}/atomic/Makefile.am | 0 .../validation/api}/atomic/atomic.c | 0 .../validation/api}/atomic/atomic.h | 0 .../validation/api}/atomic/atomic_main.c | 0 .../validation/api}/barrier/.gitignore | 0 .../validation/api}/barrier/Makefile.am | 0 .../validation/api}/barrier/barrier.c | 0 .../validation/api}/barrier/barrier.h | 0 .../validation/api}/barrier/barrier_main.c | 0 .../validation/api}/buffer/.gitignore | 0 .../validation/api}/buffer/Makefile.am | 0 .../validation/api}/buffer/buffer.c | 0 .../validation/api}/buffer/buffer.h | 0 .../validation/api}/buffer/buffer_main.c | 0 .../validation/api}/classification/.gitignore | 0 .../validation/api}/classification/Makefile.am | 0 .../api}/classification/classification.c | 0 .../api}/classification/classification.h | 0 .../api}/classification/classification_main.c | 0 .../api}/classification/odp_classification_basic.c | 0 .../classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 1 - .../api}/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api}/cpumask/.gitignore | 0 .../validation/api}/cpumask/Makefile.am | 0 .../validation/api}/cpumask/cpumask.c | 0 .../validation/api}/cpumask/cpumask.h | 0 .../validation/api}/cpumask/cpumask_main.c | 0 .../validation/api}/crypto/.gitignore | 0 .../validation/api}/crypto/Makefile.am | 0 .../validation/api}/crypto/crypto.c | 0 .../validation/api}/crypto/crypto.h | 0 .../validation/api}/crypto/crypto_main.c | 0 .../validation/api}/crypto/odp_crypto_test_inp.c | 32 ++--- .../validation/api}/crypto/odp_crypto_test_inp.h | 0 .../validation/api}/crypto/test_vectors.h | 2 +- .../validation/api}/crypto/test_vectors_len.h | 0 .../validation/api}/errno/.gitignore | 0 .../validation/api}/errno/Makefile.am | 0 .../validation/api}/errno/errno.c | 0 .../validation/api}/errno/errno.h | 0 .../validation/api}/errno/errno_main.c | 0 .../validation/api}/hash/.gitignore | 0 .../validation/api}/hash/Makefile.am | 0 .../validation/api}/hash/hash.c | 1 - .../validation/api}/hash/hash.h | 0 .../validation/api}/hash/hash_main.c | 0 .../validation/api}/init/.gitignore | 0 .../validation/api}/init/Makefile.am | 0 .../validation/api}/init/init.c | 0 .../validation/api}/init/init.h | 0 .../validation/api}/init/init_main_abort.c | 0 .../validation/api}/init/init_main_log.c | 0 .../validation/api}/init/init_main_ok.c | 0 .../validation/api}/lock/.gitignore | 0 .../validation/api}/lock/Makefile.am | 0 .../validation/api}/lock/lock.c | 0 .../validation/api}/lock/lock.h | 0 .../validation/api}/lock/lock_main.c | 0 .../validation/api}/packet/.gitignore | 0 .../validation/api}/packet/Makefile.am | 0 .../validation/api}/packet/packet.c | 0 .../validation/api}/packet/packet.h | 0 .../validation/api}/packet/packet_main.c | 0 .../validation/api}/pktio/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio.c | 2 - .../validation/api}/pktio/pktio.h | 0 .../validation/api}/pktio/pktio_main.c | 0 .../validation/api}/pool/.gitignore | 0 .../validation/api}/pool/Makefile.am | 0 .../validation/api}/pool/pool.c | 0 .../validation/api}/pool/pool.h | 0 .../validation/api}/pool/pool_main.c | 0 .../validation/api}/queue/.gitignore | 0 .../validation/api}/queue/Makefile.am | 0 .../validation/api}/queue/queue.c | 7 +- .../validation/api}/queue/queue.h | 0 .../validation/api}/queue/queue_main.c | 0 .../validation/api}/random/.gitignore | 0 .../validation/api}/random/Makefile.am | 0 .../validation/api}/random/random.c | 0 .../validation/api}/random/random.h | 0 .../validation/api}/random/random_main.c | 0 .../validation/api}/scheduler/.gitignore | 0 .../validation/api}/scheduler/Makefile.am | 0 .../validation/api}/scheduler/scheduler.c | 13 +- .../validation/api}/scheduler/scheduler.h | 0 .../validation/api}/scheduler/scheduler_main.c | 0 .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.c | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_main.c | 0 .../validation/api}/std_clib/.gitignore | 0 .../validation/api}/std_clib/Makefile.am | 0 .../validation/api}/std_clib/std_clib.c | 0 .../validation/api}/std_clib/std_clib.h | 0 .../validation/api}/std_clib/std_clib_main.c | 0 .../validation/api}/system/.gitignore | 0 .../validation/api}/system/Makefile.am | 0 .../validation/api}/system/system.c | 0 .../validation/api}/system/system.h | 0 .../validation/api}/system/system_main.c | 0 .../validation/api}/thread/.gitignore | 0 .../validation/api}/thread/Makefile.am | 0 .../validation/api}/thread/thread.c | 0 .../validation/api}/thread/thread.h | 0 .../validation/api}/thread/thread_main.c | 0 .../validation/api}/time/.gitignore | 0 .../validation/api}/time/Makefile.am | 0 .../validation/api}/time/time.c | 0 .../validation/api}/time/time.h | 0 .../validation/api}/time/time_main.c | 0 .../validation/api}/timer/.gitignore | 0 .../validation/api}/timer/Makefile.am | 0 .../validation/api}/timer/timer.c | 75 ++++++----- .../validation/api}/timer/timer.h | 0 .../validation/api}/timer/timer_main.c | 0 .../validation/api}/traffic_mngr/.gitignore | 0 .../validation/api}/traffic_mngr/Makefile.am | 0 .../validation/api}/traffic_mngr/traffic_mngr.c | 0 .../validation/api}/traffic_mngr/traffic_mngr.h | 0 .../api}/traffic_mngr/traffic_mngr_main.c | 0 test/{platform => }/linux-generic/.gitignore | 0 test/linux-generic/Makefile.am | 79 ++++++++++++ test/{platform => }/linux-generic/Makefile.inc | 4 +- test/linux-generic/m4/configure.m4 | 5 + .../linux-generic/pktio_ipc/.gitignore | 0 .../linux-generic/pktio_ipc/Makefile.am | 0 .../linux-generic/pktio_ipc/ipc_common.c | 0 .../linux-generic/pktio_ipc/ipc_common.h | 0 .../linux-generic/pktio_ipc/pktio_ipc1.c | 0 .../linux-generic/pktio_ipc/pktio_ipc2.c | 0 .../linux-generic/pktio_ipc/pktio_ipc_run.sh | 0 test/{platform => }/linux-generic/ring/.gitignore | 0 test/{platform => }/linux-generic/ring/Makefile.am | 0 .../{platform => }/linux-generic/ring/ring_basic.c | 0 test/{platform => }/linux-generic/ring/ring_main.c | 0 .../linux-generic/ring/ring_stress.c | 0 .../linux-generic/ring/ring_suites.c | 0 .../linux-generic/ring/ring_suites.h | 0 test/{platform => }/linux-generic/run-test | 0 test/linux-generic/validation/Makefile.inc | 1 + test/linux-generic/validation/api/Makefile.inc | 1 + .../validation/api/pktio}/.gitignore | 0 .../validation/api}/pktio/Makefile.am | 0 .../validation/api}/pktio/pktio_env | 0 .../validation/api}/pktio/pktio_run.sh | 4 +- .../validation/api}/pktio/pktio_run_dpdk.sh | 4 +- .../validation/api}/pktio/pktio_run_netmap.sh | 4 +- .../validation/api}/pktio/pktio_run_pcap.sh | 4 +- .../validation/api}/pktio/pktio_run_tap.sh | 4 +- .../validation/api}/shmem/.gitignore | 0 .../validation/api}/shmem/Makefile.am | 0 .../validation/api}/shmem/shmem.h | 0 .../validation/api}/shmem/shmem_common.h | 0 .../validation/api}/shmem/shmem_linux.c | 0 .../validation/api}/shmem/shmem_linux.h | 0 .../validation/api}/shmem/shmem_odp.c | 0 .../validation/api}/shmem/shmem_odp.h | 0 test/m4/configure.m4 | 33 +---- test/platform/linux-generic/Makefile.am | 74 ----------- test/platform/linux-generic/m4/configure.m4 | 5 - 195 files changed, 334 insertions(+), 286 deletions(-) create mode 100644 test/common_plat/Makefile.am rename test/{validation => common_plat}/common/Makefile.am (100%) rename test/{validation => common_plat}/common/mask_common.c (100%) rename test/{validation => common_plat}/common/mask_common.h (100%) rename test/{validation => common_plat}/common/odp_cunit_common.c (100%) rename test/{validation => common_plat}/common/odp_cunit_common.h (100%) create mode 100644 test/common_plat/m4/configure.m4 rename test/{ => common_plat}/m4/miscellaneous.m4 (100%) rename test/{ => common_plat}/m4/performance.m4 (100%) rename test/{ => common_plat}/m4/validation.m4 (100%) rename test/{ => common_plat}/miscellaneous/.gitignore (100%) rename test/{ => common_plat}/miscellaneous/Makefile.am (100%) rename test/{ => common_plat}/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{ => common_plat}/performance/.gitignore (100%) rename test/{ => common_plat}/performance/Makefile.am (100%) rename test/{ => common_plat}/performance/odp_crypto.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd.c (99%) rename test/{ => common_plat}/performance/odp_l2fwd_run.sh (90%) rename test/{ => common_plat}/performance/odp_pktio_perf.c (97%) rename test/{ => common_plat}/performance/odp_scheduling.c (98%) rename test/{ => common_plat}/performance/odp_scheduling_run.sh (100%) create mode 100644 test/common_plat/validation/Makefile.am rename test/{platform/linux-generic/pktio => common_plat/validation/api}/.gitignore (100%) rename test/{validation => common_plat/validation/api}/Makefile.am (93%) rename test/{validation => common_plat/validation/api}/Makefile.inc (83%) rename test/{validation => common_plat/validation/api}/README (100%) rename test/{validation => common_plat/validation/api}/atomic/.gitignore (100%) rename test/{validation => common_plat/validation/api}/atomic/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.c (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic.h (100%) rename test/{validation => common_plat/validation/api}/atomic/atomic_main.c (100%) rename test/{validation => common_plat/validation/api}/barrier/.gitignore (100%) rename test/{validation => common_plat/validation/api}/barrier/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.c (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier.h (100%) rename test/{validation => common_plat/validation/api}/barrier/barrier_main.c (100%) rename test/{validation => common_plat/validation/api}/buffer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/buffer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.c (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer.h (100%) rename test/{validation => common_plat/validation/api}/buffer/buffer_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/.gitignore (100%) rename test/{validation => common_plat/validation/api}/classification/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/classification/classification.c (100%) rename test/{validation => common_plat/validation/api}/classification/classification.h (100%) rename test/{validation => common_plat/validation/api}/classification/classification_main.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_basic.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_common.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_test_pmr.c (99%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_tests.c (100%) rename test/{validation => common_plat/validation/api}/classification/odp_classification_testsuites.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/.gitignore (100%) rename test/{validation => common_plat/validation/api}/cpumask/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.c (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask.h (100%) rename test/{validation => common_plat/validation/api}/cpumask/cpumask_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/.gitignore (100%) rename test/{validation => common_plat/validation/api}/crypto/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.c (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto.h (100%) rename test/{validation => common_plat/validation/api}/crypto/crypto_main.c (100%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.c (98%) rename test/{validation => common_plat/validation/api}/crypto/odp_crypto_test_inp.h (100%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors.h (99%) rename test/{validation => common_plat/validation/api}/crypto/test_vectors_len.h (100%) rename test/{validation => common_plat/validation/api}/errno/.gitignore (100%) rename test/{validation => common_plat/validation/api}/errno/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/errno/errno.c (100%) rename test/{validation => common_plat/validation/api}/errno/errno.h (100%) rename test/{validation => common_plat/validation/api}/errno/errno_main.c (100%) rename test/{validation => common_plat/validation/api}/hash/.gitignore (100%) rename test/{validation => common_plat/validation/api}/hash/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/hash/hash.c (99%) rename test/{validation => common_plat/validation/api}/hash/hash.h (100%) rename test/{validation => common_plat/validation/api}/hash/hash_main.c (100%) rename test/{validation => common_plat/validation/api}/init/.gitignore (100%) rename test/{validation => common_plat/validation/api}/init/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/init/init.c (100%) rename test/{validation => common_plat/validation/api}/init/init.h (100%) rename test/{validation => common_plat/validation/api}/init/init_main_abort.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_log.c (100%) rename test/{validation => common_plat/validation/api}/init/init_main_ok.c (100%) rename test/{validation => common_plat/validation/api}/lock/.gitignore (100%) rename test/{validation => common_plat/validation/api}/lock/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/lock/lock.c (100%) rename test/{validation => common_plat/validation/api}/lock/lock.h (100%) rename test/{validation => common_plat/validation/api}/lock/lock_main.c (100%) rename test/{validation => common_plat/validation/api}/packet/.gitignore (100%) rename test/{validation => common_plat/validation/api}/packet/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/packet/packet.c (100%) rename test/{validation => common_plat/validation/api}/packet/packet.h (100%) rename test/{validation => common_plat/validation/api}/packet/packet_main.c (100%) rename test/{validation => common_plat/validation/api}/pktio/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pktio/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio.c (99%) rename test/{validation => common_plat/validation/api}/pktio/pktio.h (100%) rename test/{validation => common_plat/validation/api}/pktio/pktio_main.c (100%) rename test/{validation => common_plat/validation/api}/pool/.gitignore (100%) rename test/{validation => common_plat/validation/api}/pool/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/pool/pool.c (100%) rename test/{validation => common_plat/validation/api}/pool/pool.h (100%) rename test/{validation => common_plat/validation/api}/pool/pool_main.c (100%) rename test/{validation => common_plat/validation/api}/queue/.gitignore (100%) rename test/{validation => common_plat/validation/api}/queue/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/queue/queue.c (98%) rename test/{validation => common_plat/validation/api}/queue/queue.h (100%) rename test/{validation => common_plat/validation/api}/queue/queue_main.c (100%) rename test/{validation => common_plat/validation/api}/random/.gitignore (100%) rename test/{validation => common_plat/validation/api}/random/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/random/random.c (100%) rename test/{validation => common_plat/validation/api}/random/random.h (100%) rename test/{validation => common_plat/validation/api}/random/random_main.c (100%) rename test/{validation => common_plat/validation/api}/scheduler/.gitignore (100%) rename test/{validation => common_plat/validation/api}/scheduler/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.c (99%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler.h (100%) rename test/{validation => common_plat/validation/api}/scheduler/scheduler_main.c (100%) rename test/{validation => common_plat/validation/api}/shmem/.gitignore (100%) rename test/{validation => common_plat/validation/api}/shmem/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.c (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem.h (100%) rename test/{validation => common_plat/validation/api}/shmem/shmem_main.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/.gitignore (100%) rename test/{validation => common_plat/validation/api}/std_clib/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.c (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib.h (100%) rename test/{validation => common_plat/validation/api}/std_clib/std_clib_main.c (100%) rename test/{validation => common_plat/validation/api}/system/.gitignore (100%) rename test/{validation => common_plat/validation/api}/system/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/system/system.c (100%) rename test/{validation => common_plat/validation/api}/system/system.h (100%) rename test/{validation => common_plat/validation/api}/system/system_main.c (100%) rename test/{validation => common_plat/validation/api}/thread/.gitignore (100%) rename test/{validation => common_plat/validation/api}/thread/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/thread/thread.c (100%) rename test/{validation => common_plat/validation/api}/thread/thread.h (100%) rename test/{validation => common_plat/validation/api}/thread/thread_main.c (100%) rename test/{validation => common_plat/validation/api}/time/.gitignore (100%) rename test/{validation => common_plat/validation/api}/time/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/time/time.c (100%) rename test/{validation => common_plat/validation/api}/time/time.h (100%) rename test/{validation => common_plat/validation/api}/time/time_main.c (100%) rename test/{validation => common_plat/validation/api}/timer/.gitignore (100%) rename test/{validation => common_plat/validation/api}/timer/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/timer/timer.c (93%) rename test/{validation => common_plat/validation/api}/timer/timer.h (100%) rename test/{validation => common_plat/validation/api}/timer/timer_main.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/.gitignore (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/Makefile.am (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.c (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr.h (100%) rename test/{validation => common_plat/validation/api}/traffic_mngr/traffic_mngr_main.c (100%) rename test/{platform => }/linux-generic/.gitignore (100%) create mode 100644 test/linux-generic/Makefile.am rename test/{platform => }/linux-generic/Makefile.inc (78%) create mode 100644 test/linux-generic/m4/configure.m4 rename test/{platform => }/linux-generic/pktio_ipc/.gitignore (100%) rename test/{platform => }/linux-generic/pktio_ipc/Makefile.am (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/ipc_common.h (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc1.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc2.c (100%) rename test/{platform => }/linux-generic/pktio_ipc/pktio_ipc_run.sh (100%) rename test/{platform => }/linux-generic/ring/.gitignore (100%) rename test/{platform => }/linux-generic/ring/Makefile.am (100%) rename test/{platform => }/linux-generic/ring/ring_basic.c (100%) rename test/{platform => }/linux-generic/ring/ring_main.c (100%) rename test/{platform => }/linux-generic/ring/ring_stress.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.c (100%) rename test/{platform => }/linux-generic/ring/ring_suites.h (100%) rename test/{platform => }/linux-generic/run-test (100%) create mode 100644 test/linux-generic/validation/Makefile.inc create mode 100644 test/linux-generic/validation/api/Makefile.inc rename test/{validation => linux-generic/validation/api/pktio}/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_env (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run.sh (96%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_dpdk.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_netmap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_pcap.sh (90%) rename test/{platform/linux-generic => linux-generic/validation/api}/pktio/pktio_run_tap.sh (95%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/.gitignore (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/Makefile.am (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_common.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_linux.h (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.c (100%) rename test/{platform/linux-generic => linux-generic/validation/api}/shmem/shmem_odp.h (100%) delete mode 100644 test/platform/linux-generic/Makefile.am delete mode 100644 test/platform/linux-generic/m4/configure.m4

hooks/post-receive