test: linux-gen: move platform-specific tests to platform directory

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

54 files changed, 32 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 6c43679e7..c8013c2c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,18 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides	\
 			       --enable-helper-linux	\
 			       --with-testdir
 
-#@with_platform@ works alone in subdir but not as part of a path???
-SUBDIRS = @platform_with_platform@ \
+if PLATFORM_IS_LINUX_GENERIC
+PLATFORM_DIR = platform/linux-generic
+PLATFORM_TEST_DIR = platform/linux-generic/test
+endif
+
+SUBDIRS = $(PLATFORM_DIR) \
 	  helper \
 	  helper/test \
 	  doc \
 	  example . \
-	  test
+	  test \
+	  $(PLATFORM_TEST_DIR)
 
 @DX_RULES@
 
diff --git a/configure.ac b/configure.ac
index 6c47c3c3f..428b0bace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,9 @@ AC_ARG_WITH([platform],
     ])
 
 AC_SUBST([with_platform])
-AC_SUBST([platform_with_platform], ["platform/${with_platform}"])
+
+AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC],
+	       [test "x$with_platform" = "xlinux-generic"])
 
 ##########################################################################
 # Run platform specific checks and settings
@@ -173,7 +175,6 @@ IMPLEMENTATION_NAME=""
 if test "${with_platform}" = "linux-generic";
 then
     m4_include([./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/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index 397c539b8..1a09102e7 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -9,5 +9,14 @@ m4_include([platform/linux-generic/m4/odp_netmap.m4])
 m4_include([platform/linux-generic/m4/odp_dpdk.m4])
 m4_include([platform/linux-generic/m4/odp_schedule.m4])
 
+m4_include([platform/linux-generic/m4/performance.m4])
+
 AC_CONFIG_FILES([platform/linux-generic/Makefile
-                 platform/linux-generic/include/odp/api/plat/static_inline.h])
+		 platform/linux-generic/include/odp/api/plat/static_inline.h
+		 platform/linux-generic/test/Makefile
+		 platform/linux-generic/test/validation/api/shmem/Makefile
+		 platform/linux-generic/test/validation/api/pktio/Makefile
+		 platform/linux-generic/test/mmap_vlan_ins/Makefile
+		 platform/linux-generic/test/pktio_ipc/Makefile
+		 platform/linux-generic/test/ring/Makefile
+		 platform/linux-generic/test/performance/Makefile])
diff --git a/test/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4
index 05b3a9905..05b3a9905 100644
--- a/test/linux-generic/m4/performance.m4
+++ b/platform/linux-generic/m4/performance.m4
diff --git a/test/linux-generic/.gitignore b/platform/linux-generic/test/.gitignore
index 5dabf91c1..5dabf91c1 100644
--- a/test/linux-generic/.gitignore
+++ b/platform/linux-generic/test/.gitignore
diff --git a/test/linux-generic/Makefile.am b/platform/linux-generic/test/Makefile.am
index c65a26fd7..c65a26fd7 100644
--- a/test/linux-generic/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
diff --git a/test/linux-generic/Makefile.inc b/platform/linux-generic/test/Makefile.inc
index cfb614419..cfb614419 100644
--- a/test/linux-generic/Makefile.inc
+++ b/platform/linux-generic/test/Makefile.inc
diff --git a/test/linux-generic/mmap_vlan_ins/.gitignore b/platform/linux-generic/test/mmap_vlan_ins/.gitignore
index 755fa2ed5..755fa2ed5 100644
--- a/test/linux-generic/mmap_vlan_ins/.gitignore
+++ b/platform/linux-generic/test/mmap_vlan_ins/.gitignore
diff --git a/test/linux-generic/mmap_vlan_ins/Makefile.am b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am
index e42b5254c..e42b5254c 100644
--- a/test/linux-generic/mmap_vlan_ins/Makefile.am
+++ b/platform/linux-generic/test/mmap_vlan_ins/Makefile.am
diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
index 3238f9afa..3238f9afa 100644
--- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c
+++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.c
diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh
index 3c6df8ecd..3c6df8ecd 100755
--- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.sh
+++ b/platform/linux-generic/test/mmap_vlan_ins/mmap_vlan_ins.sh
diff --git a/test/linux-generic/mmap_vlan_ins/pktio_env b/platform/linux-generic/test/mmap_vlan_ins/pktio_env
index 345b5bd56..345b5bd56 100644
--- a/test/linux-generic/mmap_vlan_ins/pktio_env
+++ b/platform/linux-generic/test/mmap_vlan_ins/pktio_env
diff --git a/test/linux-generic/mmap_vlan_ins/vlan.pcap b/platform/linux-generic/test/mmap_vlan_ins/vlan.pcap
index 106ccb682..106ccb682 100644
--- a/test/linux-generic/mmap_vlan_ins/vlan.pcap
+++ b/platform/linux-generic/test/mmap_vlan_ins/vlan.pcap
diff --git a/test/linux-generic/performance/.gitignore b/platform/linux-generic/test/performance/.gitignore
index 7e563b8b3..7e563b8b3 100644
--- a/test/linux-generic/performance/.gitignore
+++ b/platform/linux-generic/test/performance/.gitignore
diff --git a/test/linux-generic/performance/Makefile.am b/platform/linux-generic/test/performance/Makefile.am
index 0b5da671f..0b5da671f 100644
--- a/test/linux-generic/performance/Makefile.am
+++ b/platform/linux-generic/test/performance/Makefile.am
diff --git a/test/linux-generic/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
index 384017aff..a57df6c0b 100755
--- a/test/linux-generic/performance/odp_scheduling_run_proc.sh
+++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh
@@ -9,7 +9,7 @@
 # launched by 'make check'
 
 TEST_DIR="${TEST_DIR:-$(dirname $0)}"
-PERFORMANCE="$TEST_DIR/../../common_plat/performance"
+PERFORMANCE="$TEST_DIR/../../../../test/common_plat/performance"
 ret=0
 ALL=0
 
diff --git a/test/linux-generic/pktio_ipc/.gitignore b/platform/linux-generic/test/pktio_ipc/.gitignore
index 49ee4fd29..49ee4fd29 100644
--- a/test/linux-generic/pktio_ipc/.gitignore
+++ b/platform/linux-generic/test/pktio_ipc/.gitignore
diff --git a/test/linux-generic/pktio_ipc/Makefile.am b/platform/linux-generic/test/pktio_ipc/Makefile.am
index 4287fbc08..4287fbc08 100644
--- a/test/linux-generic/pktio_ipc/Makefile.am
+++ b/platform/linux-generic/test/pktio_ipc/Makefile.am
diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/platform/linux-generic/test/pktio_ipc/ipc_common.c
index b0fa12a1f..b0fa12a1f 100644
--- a/test/linux-generic/pktio_ipc/ipc_common.c
+++ b/platform/linux-generic/test/pktio_ipc/ipc_common.c
diff --git a/test/linux-generic/pktio_ipc/ipc_common.h b/platform/linux-generic/test/pktio_ipc/ipc_common.h
index 2b04b1448..2b04b1448 100644
--- a/test/linux-generic/pktio_ipc/ipc_common.h
+++ b/platform/linux-generic/test/pktio_ipc/ipc_common.h
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
index ee46d1dac..ee46d1dac 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc1.c
+++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
index deb6eddfd..deb6eddfd 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc2.c
+++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh b/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh
index b713c63cd..b713c63cd 100755
--- a/test/linux-generic/pktio_ipc/pktio_ipc_run.sh
+++ b/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh
diff --git a/test/linux-generic/ring/.gitignore b/platform/linux-generic/test/ring/.gitignore
index 7341a340c..7341a340c 100644
--- a/test/linux-generic/ring/.gitignore
+++ b/platform/linux-generic/test/ring/.gitignore
diff --git a/test/linux-generic/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am
index 57ba82aef..57ba82aef 100644
--- a/test/linux-generic/ring/Makefile.am
+++ b/platform/linux-generic/test/ring/Makefile.am
diff --git a/test/linux-generic/ring/ring_basic.c b/platform/linux-generic/test/ring/ring_basic.c
index 62382becd..62382becd 100644
--- a/test/linux-generic/ring/ring_basic.c
+++ b/platform/linux-generic/test/ring/ring_basic.c
diff --git a/test/linux-generic/ring/ring_main.c b/platform/linux-generic/test/ring/ring_main.c
index b1f59a9bd..b1f59a9bd 100644
--- a/test/linux-generic/ring/ring_main.c
+++ b/platform/linux-generic/test/ring/ring_main.c
diff --git a/test/linux-generic/ring/ring_stress.c b/platform/linux-generic/test/ring/ring_stress.c
index 115d130e8..115d130e8 100644
--- a/test/linux-generic/ring/ring_stress.c
+++ b/platform/linux-generic/test/ring/ring_stress.c
diff --git a/test/linux-generic/ring/ring_suites.c b/platform/linux-generic/test/ring/ring_suites.c
index 153826ff0..153826ff0 100644
--- a/test/linux-generic/ring/ring_suites.c
+++ b/platform/linux-generic/test/ring/ring_suites.c
diff --git a/test/linux-generic/ring/ring_suites.h b/platform/linux-generic/test/ring/ring_suites.h
index 5fa5b9c52..5fa5b9c52 100644
--- a/test/linux-generic/ring/ring_suites.h
+++ b/platform/linux-generic/test/ring/ring_suites.h
diff --git a/platform/linux-generic/test/validation/Makefile.inc b/platform/linux-generic/test/validation/Makefile.inc
new file mode 100644
index 000000000..b9030850c
--- /dev/null
+++ b/platform/linux-generic/test/validation/Makefile.inc
@@ -0,0 +1 @@
+include $(top_srcdir)/platform/linux-generic/test/Makefile.inc
diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc
new file mode 100644
index 000000000..c47217d1a
--- /dev/null
+++ b/platform/linux-generic/test/validation/api/Makefile.inc
@@ -0,0 +1 @@
+include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc
diff --git a/test/linux-generic/validation/api/pktio/.gitignore b/platform/linux-generic/test/validation/api/pktio/.gitignore
index 7e563b8b3..7e563b8b3 100644
--- a/test/linux-generic/validation/api/pktio/.gitignore
+++ b/platform/linux-generic/test/validation/api/pktio/.gitignore
diff --git a/test/linux-generic/validation/api/pktio/Makefile.am b/platform/linux-generic/test/validation/api/pktio/Makefile.am
index 4a1434397..4a1434397 100644
--- a/test/linux-generic/validation/api/pktio/Makefile.am
+++ b/platform/linux-generic/test/validation/api/pktio/Makefile.am
diff --git a/test/linux-generic/validation/api/pktio/pktio_env b/platform/linux-generic/test/validation/api/pktio/pktio_env
index 345b5bd56..345b5bd56 100644
--- a/test/linux-generic/validation/api/pktio/pktio_env
+++ b/platform/linux-generic/test/validation/api/pktio/pktio_env
diff --git a/test/linux-generic/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh
index 19def8c5a..075929e8c 100755
--- a/test/linux-generic/validation/api/pktio/pktio_run.sh
+++ b/platform/linux-generic/test/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)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh
index 3060dc003..0baf7e132 100755
--- a/test/linux-generic/validation/api/pktio/pktio_run_dpdk.sh
+++ b/platform/linux-generic/test/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)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh
index 7dde7ae1c..bf4123767 100755
--- a/test/linux-generic/validation/api/pktio/pktio_run_netmap.sh
+++ b/platform/linux-generic/test/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)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh
index b5b773548..4b5a0b3f1 100755
--- a/test/linux-generic/validation/api/pktio/pktio_run_pcap.sh
+++ b/platform/linux-generic/test/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)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/linux-generic/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh
index 89579ca68..e5b72335d 100755
--- a/test/linux-generic/validation/api/pktio/pktio_run_tap.sh
+++ b/platform/linux-generic/test/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)/../../../../common_plat/validation/api/pktio:$PATH
+PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH
 PATH=.:$PATH
 
 pktio_main_path=$(which pktio_main${EXEEXT})
diff --git a/test/linux-generic/validation/api/shmem/.gitignore b/platform/linux-generic/test/validation/api/shmem/.gitignore
index 74195f576..74195f576 100644
--- a/test/linux-generic/validation/api/shmem/.gitignore
+++ b/platform/linux-generic/test/validation/api/shmem/.gitignore
diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am
index 962450e56..962450e56 100644
--- a/test/linux-generic/validation/api/shmem/Makefile.am
+++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am
diff --git a/test/linux-generic/validation/api/shmem/shmem_common.h b/platform/linux-generic/test/validation/api/shmem/shmem_common.h
index 0a90297fa..0a90297fa 100644
--- a/test/linux-generic/validation/api/shmem/shmem_common.h
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_common.h
diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
index 10bbb6a47..10bbb6a47 100644
--- a/test/linux-generic/validation/api/shmem/shmem_linux.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.h b/platform/linux-generic/test/validation/api/shmem/shmem_linux.h
index a07a7758f..a07a7758f 100644
--- a/test/linux-generic/validation/api/shmem/shmem_linux.h
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.h
diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
index 8cd89c8f7..8cd89c8f7 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp1.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h
index 614bbf805..614bbf805 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp1.h
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.h
diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
index 4f4fc3fed..4f4fc3fed 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp2.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.h b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h
index a8db909a8..a8db909a8 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp2.h
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.h
diff --git a/test/Makefile.am b/test/Makefile.am
index 3b5917329..67ae76aed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common_plat @with_platform@
+SUBDIRS = common_plat
diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/common_plat/performance/odp_l2fwd_run.sh
index 6871e4b07..f9f25ab38 100755
--- a/test/common_plat/performance/odp_l2fwd_run.sh
+++ b/test/common_plat/performance/odp_l2fwd_run.sh
@@ -30,7 +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
+VALIDATION_TESTDIR=platform/$ODP_PLATFORM/test/validation
+PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../$VALIDATION_TESTDIR
 
 FLOOD_MODE=0
 
diff --git a/test/linux-generic/m4/configure.m4 b/test/linux-generic/m4/configure.m4
deleted file mode 100644
index 8746dabc8..000000000
--- a/test/linux-generic/m4/configure.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-m4_include([test/linux-generic/m4/performance.m4])
-
-AC_CONFIG_FILES([test/linux-generic/Makefile
-		 test/linux-generic/validation/api/shmem/Makefile
-		 test/linux-generic/validation/api/pktio/Makefile
-		 test/linux-generic/mmap_vlan_ins/Makefile
-		 test/linux-generic/pktio_ipc/Makefile
-		 test/linux-generic/ring/Makefile
-		 test/linux-generic/performance/Makefile])
diff --git a/test/linux-generic/validation/Makefile.inc b/test/linux-generic/validation/Makefile.inc
deleted file mode 100644
index cf1dedb9f..000000000
--- a/test/linux-generic/validation/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 19c9448c0..000000000
--- a/test/linux-generic/validation/api/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-include $(top_srcdir)/test/linux-generic/validation/Makefile.inc