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>

41 files changed, 41 insertions, 38 deletions

diff --git a/configure.ac b/configure.ac
index c0eb20796..c0f0f2175 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 59532c811..3b5917329 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 68e4498a6..e64aa472a 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
index 5dabf91c1..5dabf91c1 100644
--- a/test/platform/linux-generic/.gitignore
+++ b/test/linux-generic/.gitignore
diff --git a/test/platform/linux-generic/Makefile.am b/test/linux-generic/Makefile.am
index 83da1402c..f5cc52d4d 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
index b26324f83..b26324f83 100644
--- a/test/platform/linux-generic/Makefile.inc
+++ b/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 000000000..9eec545ee
--- /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
index 49ee4fd29..49ee4fd29 100644
--- a/test/platform/linux-generic/pktio_ipc/.gitignore
+++ b/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
index 8858bd2f5..8858bd2f5 100644
--- a/test/platform/linux-generic/pktio_ipc/Makefile.am
+++ b/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
index 2ee326e28..2ee326e28 100644
--- a/test/platform/linux-generic/pktio_ipc/ipc_common.c
+++ b/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
index a6b7c581b..a6b7c581b 100644
--- a/test/platform/linux-generic/pktio_ipc/ipc_common.h
+++ b/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
index a4eed8832..a4eed8832 100644
--- a/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c
+++ b/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
index c0c6ff543..c0c6ff543 100644
--- a/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c
+++ b/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
index 112800273..112800273 100755
--- a/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh
+++ b/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
diff --git a/test/platform/linux-generic/ring/.gitignore b/test/linux-generic/ring/.gitignore
index 7341a340c..7341a340c 100644
--- a/test/platform/linux-generic/ring/.gitignore
+++ b/test/linux-generic/ring/.gitignore
diff --git a/test/platform/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am
index c08658482..c08658482 100644
--- a/test/platform/linux-generic/ring/Makefile.am
+++ b/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
index 926dc465d..926dc465d 100644
--- a/test/platform/linux-generic/ring/ring_basic.c
+++ b/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
index 715268843..715268843 100644
--- a/test/platform/linux-generic/ring/ring_main.c
+++ b/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
index bc61c3e4f..bc61c3e4f 100644
--- a/test/platform/linux-generic/ring/ring_stress.c
+++ b/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
index f321a762a..f321a762a 100644
--- a/test/platform/linux-generic/ring/ring_suites.c
+++ b/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
index 5fa5b9c52..5fa5b9c52 100644
--- a/test/platform/linux-generic/ring/ring_suites.h
+++ b/test/linux-generic/ring/ring_suites.h
diff --git a/test/platform/linux-generic/run-test b/test/linux-generic/run-test
index 2bff651cc..2bff651cc 100755
--- a/test/platform/linux-generic/run-test
+++ b/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 000000000..cf1dedb9f
--- /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 000000000..19c9448c0
--- /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
index 7e563b8b3..7e563b8b3 100644
--- a/test/platform/linux-generic/pktio/.gitignore
+++ b/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
index 4a1434397..4a1434397 100644
--- a/test/platform/linux-generic/pktio/Makefile.am
+++ b/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
index 345b5bd56..345b5bd56 100644
--- a/test/platform/linux-generic/pktio/pktio_env
+++ b/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
index 0905b8b28..e8b0f936f 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
index 4d16b29c4..fa46fa430 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
index 6fd271b29..7dde7ae1c 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
index 721141a9d..b5b773548 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
index 96f6d5a9f..89579ca68 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
index 76270794c..76270794c 100644
--- a/test/platform/linux-generic/shmem/.gitignore
+++ b/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
index 341747f81..341747f81 100644
--- a/test/platform/linux-generic/shmem/Makefile.am
+++ b/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
index 2368a2e1c..2368a2e1c 100644
--- a/test/platform/linux-generic/shmem/shmem.h
+++ b/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
index 16227ecd5..16227ecd5 100644
--- a/test/platform/linux-generic/shmem/shmem_common.h
+++ b/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
index 212a6c13a..212a6c13a 100644
--- a/test/platform/linux-generic/shmem/shmem_linux.c
+++ b/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
index a07a7758f..a07a7758f 100644
--- a/test/platform/linux-generic/shmem/shmem_linux.h
+++ b/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
index a1f750f89..a1f750f89 100644
--- a/test/platform/linux-generic/shmem/shmem_odp.c
+++ b/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
index 614bbf805..614bbf805 100644
--- a/test/platform/linux-generic/shmem/shmem_odp.h
+++ b/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 8c3db21ab..000000000
--- 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])