aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
-rw-r--r--platform/linux-generic/m4/configure.m47
-rw-r--r--test/Makefile.am2
-rwxr-xr-xtest/performance/odp_l2fwd_run.sh4
-rw-r--r--test/platform/linux-generic/.gitignore (renamed from platform/linux-generic/test/.gitignore)0
-rw-r--r--test/platform/linux-generic/Makefile.am (renamed from platform/linux-generic/test/Makefile.am)0
-rw-r--r--test/platform/linux-generic/Makefile.inc (renamed from platform/linux-generic/test/Makefile.inc)0
-rw-r--r--test/platform/linux-generic/m4/configure.m45
-rw-r--r--test/platform/linux-generic/pktio/.gitignore (renamed from platform/linux-generic/test/pktio/.gitignore)0
-rw-r--r--test/platform/linux-generic/pktio/Makefile.am (renamed from platform/linux-generic/test/pktio/Makefile.am)0
-rw-r--r--test/platform/linux-generic/pktio/pktio_env (renamed from platform/linux-generic/test/pktio/pktio_env)0
-rwxr-xr-xtest/platform/linux-generic/pktio/pktio_run.sh (renamed from platform/linux-generic/test/pktio/pktio_run.sh)0
-rwxr-xr-xtest/platform/linux-generic/pktio/pktio_run_dpdk.sh (renamed from platform/linux-generic/test/pktio/pktio_run_dpdk.sh)0
-rwxr-xr-xtest/platform/linux-generic/pktio/pktio_run_netmap.sh (renamed from platform/linux-generic/test/pktio/pktio_run_netmap.sh)0
-rwxr-xr-xtest/platform/linux-generic/pktio/pktio_run_pcap.sh (renamed from platform/linux-generic/test/pktio/pktio_run_pcap.sh)0
-rwxr-xr-xtest/platform/linux-generic/pktio/pktio_run_tap.sh (renamed from platform/linux-generic/test/pktio/pktio_run_tap.sh)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/.gitignore (renamed from platform/linux-generic/test/pktio_ipc/.gitignore)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/Makefile.am (renamed from platform/linux-generic/test/pktio_ipc/Makefile.am)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/ipc_common.c (renamed from platform/linux-generic/test/pktio_ipc/ipc_common.c)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/ipc_common.h (renamed from platform/linux-generic/test/pktio_ipc/ipc_common.h)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/pktio_ipc1.c (renamed from platform/linux-generic/test/pktio_ipc/pktio_ipc1.c)0
-rw-r--r--test/platform/linux-generic/pktio_ipc/pktio_ipc2.c (renamed from platform/linux-generic/test/pktio_ipc/pktio_ipc2.c)0
-rwxr-xr-xtest/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh (renamed from platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh)0
-rw-r--r--test/platform/linux-generic/ring/.gitignore (renamed from platform/linux-generic/test/ring/.gitignore)0
-rw-r--r--test/platform/linux-generic/ring/Makefile.am (renamed from platform/linux-generic/test/ring/Makefile.am)0
-rw-r--r--test/platform/linux-generic/ring/ring_basic.c (renamed from platform/linux-generic/test/ring/ring_basic.c)0
-rw-r--r--test/platform/linux-generic/ring/ring_main.c (renamed from platform/linux-generic/test/ring/ring_main.c)0
-rw-r--r--test/platform/linux-generic/ring/ring_stress.c (renamed from platform/linux-generic/test/ring/ring_stress.c)0
-rw-r--r--test/platform/linux-generic/ring/ring_suites.c (renamed from platform/linux-generic/test/ring/ring_suites.c)0
-rw-r--r--test/platform/linux-generic/ring/ring_suites.h (renamed from platform/linux-generic/test/ring/ring_suites.h)0
-rwxr-xr-xtest/platform/linux-generic/run-test (renamed from platform/linux-generic/test/run-test)0
-rw-r--r--test/platform/linux-generic/shmem/.gitignore (renamed from platform/linux-generic/test/shmem/.gitignore)0
-rw-r--r--test/platform/linux-generic/shmem/Makefile.am (renamed from platform/linux-generic/test/shmem/Makefile.am)0
-rw-r--r--test/platform/linux-generic/shmem/shmem.h (renamed from platform/linux-generic/test/shmem/shmem.h)0
-rw-r--r--test/platform/linux-generic/shmem/shmem_common.h (renamed from platform/linux-generic/test/shmem/shmem_common.h)0
-rw-r--r--test/platform/linux-generic/shmem/shmem_linux.c (renamed from platform/linux-generic/test/shmem/shmem_linux.c)0
-rw-r--r--test/platform/linux-generic/shmem/shmem_linux.h (renamed from platform/linux-generic/test/shmem/shmem_linux.h)0
-rw-r--r--test/platform/linux-generic/shmem/shmem_odp.c (renamed from platform/linux-generic/test/shmem/shmem_odp.c)0
-rw-r--r--test/platform/linux-generic/shmem/shmem_odp.h (renamed from platform/linux-generic/test/shmem/shmem_odp.h)0
40 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 212947260..625748af2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \
SUBDIRS = @platform_with_platform@ \
helper \
test \
- @platform_with_platform_test@ \
helper/test \
doc \
example \
diff --git a/configure.ac b/configure.ac
index c87755b31..f3952dbac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,6 @@ AC_ARG_WITH([platform],
AC_SUBST([with_platform])
AC_SUBST([platform_with_platform], ["platform/${with_platform}"])
-AC_SUBST([platform_with_platform_test], ["platform/${with_platform}/test"])
##########################################################################
# Run platform specific checks and settings
@@ -116,6 +115,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])
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 5380046e1..1b1b883da 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -36,9 +36,4 @@ m4_include([platform/linux-generic/m4/odp_dpdk.m4])
m4_include([platform/linux-generic/m4/odp_ipc.m4])
m4_include([platform/linux-generic/m4/odp_schedule.m4])
-AC_CONFIG_FILES([platform/linux-generic/Makefile
- platform/linux-generic/test/Makefile
- platform/linux-generic/test/shmem/Makefile
- platform/linux-generic/test/pktio/Makefile
- platform/linux-generic/test/pktio_ipc/Makefile
- platform/linux-generic/test/ring/Makefile])
+AC_CONFIG_FILES([platform/linux-generic/Makefile])
diff --git a/test/Makefile.am b/test/Makefile.am
index 4a7536469..8bab8fd5b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = performance miscellaneous
if cunit_support
- SUBDIRS += validation
+ SUBDIRS += validation @platform_with_platform@
endif
diff --git a/test/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh
index cab97a8cf..fc3d05d6b 100755
--- a/test/performance/odp_l2fwd_run.sh
+++ b/test/performance/odp_l2fwd_run.sh
@@ -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/test/pktio/pktio_env ]; then
- . ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/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/platform/linux-generic/test/.gitignore b/test/platform/linux-generic/.gitignore
index 5dabf91c1..5dabf91c1 100644
--- a/platform/linux-generic/test/.gitignore
+++ b/test/platform/linux-generic/.gitignore
diff --git a/platform/linux-generic/test/Makefile.am b/test/platform/linux-generic/Makefile.am
index 2d58c573b..2d58c573b 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/test/platform/linux-generic/Makefile.am
diff --git a/platform/linux-generic/test/Makefile.inc b/test/platform/linux-generic/Makefile.inc
index 80b66ae99..80b66ae99 100644
--- a/platform/linux-generic/test/Makefile.inc
+++ b/test/platform/linux-generic/Makefile.inc
diff --git a/test/platform/linux-generic/m4/configure.m4 b/test/platform/linux-generic/m4/configure.m4
new file mode 100644
index 000000000..8c3db21ab
--- /dev/null
+++ b/test/platform/linux-generic/m4/configure.m4
@@ -0,0 +1,5 @@
+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])
diff --git a/platform/linux-generic/test/pktio/.gitignore b/test/platform/linux-generic/pktio/.gitignore
index 7e563b8b3..7e563b8b3 100644
--- a/platform/linux-generic/test/pktio/.gitignore
+++ b/test/platform/linux-generic/pktio/.gitignore
diff --git a/platform/linux-generic/test/pktio/Makefile.am b/test/platform/linux-generic/pktio/Makefile.am
index 4a1434397..4a1434397 100644
--- a/platform/linux-generic/test/pktio/Makefile.am
+++ b/test/platform/linux-generic/pktio/Makefile.am
diff --git a/platform/linux-generic/test/pktio/pktio_env b/test/platform/linux-generic/pktio/pktio_env
index 345b5bd56..345b5bd56 100644
--- a/platform/linux-generic/test/pktio/pktio_env
+++ b/test/platform/linux-generic/pktio/pktio_env
diff --git a/platform/linux-generic/test/pktio/pktio_run.sh b/test/platform/linux-generic/pktio/pktio_run.sh
index 1dc1f4491..1dc1f4491 100755
--- a/platform/linux-generic/test/pktio/pktio_run.sh
+++ b/test/platform/linux-generic/pktio/pktio_run.sh
diff --git a/platform/linux-generic/test/pktio/pktio_run_dpdk.sh b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh
index fd552c65c..fd552c65c 100755
--- a/platform/linux-generic/test/pktio/pktio_run_dpdk.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_dpdk.sh
diff --git a/platform/linux-generic/test/pktio/pktio_run_netmap.sh b/test/platform/linux-generic/pktio/pktio_run_netmap.sh
index b651ea346..b651ea346 100755
--- a/platform/linux-generic/test/pktio/pktio_run_netmap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_netmap.sh
diff --git a/platform/linux-generic/test/pktio/pktio_run_pcap.sh b/test/platform/linux-generic/pktio/pktio_run_pcap.sh
index 51716fb4d..51716fb4d 100755
--- a/platform/linux-generic/test/pktio/pktio_run_pcap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_pcap.sh
diff --git a/platform/linux-generic/test/pktio/pktio_run_tap.sh b/test/platform/linux-generic/pktio/pktio_run_tap.sh
index 1150158a7..1150158a7 100755
--- a/platform/linux-generic/test/pktio/pktio_run_tap.sh
+++ b/test/platform/linux-generic/pktio/pktio_run_tap.sh
diff --git a/platform/linux-generic/test/pktio_ipc/.gitignore b/test/platform/linux-generic/pktio_ipc/.gitignore
index 49ee4fd29..49ee4fd29 100644
--- a/platform/linux-generic/test/pktio_ipc/.gitignore
+++ b/test/platform/linux-generic/pktio_ipc/.gitignore
diff --git a/platform/linux-generic/test/pktio_ipc/Makefile.am b/test/platform/linux-generic/pktio_ipc/Makefile.am
index 8858bd2f5..8858bd2f5 100644
--- a/platform/linux-generic/test/pktio_ipc/Makefile.am
+++ b/test/platform/linux-generic/pktio_ipc/Makefile.am
diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.c b/test/platform/linux-generic/pktio_ipc/ipc_common.c
index 2ee326e28..2ee326e28 100644
--- a/platform/linux-generic/test/pktio_ipc/ipc_common.c
+++ b/test/platform/linux-generic/pktio_ipc/ipc_common.c
diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.h b/test/platform/linux-generic/pktio_ipc/ipc_common.h
index 7bc483f78..7bc483f78 100644
--- a/platform/linux-generic/test/pktio_ipc/ipc_common.h
+++ b/test/platform/linux-generic/pktio_ipc/ipc_common.h
diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c b/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c
index a4eed8832..a4eed8832 100644
--- a/platform/linux-generic/test/pktio_ipc/pktio_ipc1.c
+++ b/test/platform/linux-generic/pktio_ipc/pktio_ipc1.c
diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c b/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c
index c0c6ff543..c0c6ff543 100644
--- a/platform/linux-generic/test/pktio_ipc/pktio_ipc2.c
+++ b/test/platform/linux-generic/pktio_ipc/pktio_ipc2.c
diff --git a/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh b/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh
index 112800273..112800273 100755
--- a/platform/linux-generic/test/pktio_ipc/pktio_ipc_run.sh
+++ b/test/platform/linux-generic/pktio_ipc/pktio_ipc_run.sh
diff --git a/platform/linux-generic/test/ring/.gitignore b/test/platform/linux-generic/ring/.gitignore
index 7341a340c..7341a340c 100644
--- a/platform/linux-generic/test/ring/.gitignore
+++ b/test/platform/linux-generic/ring/.gitignore
diff --git a/platform/linux-generic/test/ring/Makefile.am b/test/platform/linux-generic/ring/Makefile.am
index c08658482..c08658482 100644
--- a/platform/linux-generic/test/ring/Makefile.am
+++ b/test/platform/linux-generic/ring/Makefile.am
diff --git a/platform/linux-generic/test/ring/ring_basic.c b/test/platform/linux-generic/ring/ring_basic.c
index 926dc465d..926dc465d 100644
--- a/platform/linux-generic/test/ring/ring_basic.c
+++ b/test/platform/linux-generic/ring/ring_basic.c
diff --git a/platform/linux-generic/test/ring/ring_main.c b/test/platform/linux-generic/ring/ring_main.c
index 715268843..715268843 100644
--- a/platform/linux-generic/test/ring/ring_main.c
+++ b/test/platform/linux-generic/ring/ring_main.c
diff --git a/platform/linux-generic/test/ring/ring_stress.c b/test/platform/linux-generic/ring/ring_stress.c
index bc61c3e4f..bc61c3e4f 100644
--- a/platform/linux-generic/test/ring/ring_stress.c
+++ b/test/platform/linux-generic/ring/ring_stress.c
diff --git a/platform/linux-generic/test/ring/ring_suites.c b/test/platform/linux-generic/ring/ring_suites.c
index f321a762a..f321a762a 100644
--- a/platform/linux-generic/test/ring/ring_suites.c
+++ b/test/platform/linux-generic/ring/ring_suites.c
diff --git a/platform/linux-generic/test/ring/ring_suites.h b/test/platform/linux-generic/ring/ring_suites.h
index 5fa5b9c52..5fa5b9c52 100644
--- a/platform/linux-generic/test/ring/ring_suites.h
+++ b/test/platform/linux-generic/ring/ring_suites.h
diff --git a/platform/linux-generic/test/run-test b/test/platform/linux-generic/run-test
index 2bff651cc..2bff651cc 100755
--- a/platform/linux-generic/test/run-test
+++ b/test/platform/linux-generic/run-test
diff --git a/platform/linux-generic/test/shmem/.gitignore b/test/platform/linux-generic/shmem/.gitignore
index 76270794c..76270794c 100644
--- a/platform/linux-generic/test/shmem/.gitignore
+++ b/test/platform/linux-generic/shmem/.gitignore
diff --git a/platform/linux-generic/test/shmem/Makefile.am b/test/platform/linux-generic/shmem/Makefile.am
index 341747f81..341747f81 100644
--- a/platform/linux-generic/test/shmem/Makefile.am
+++ b/test/platform/linux-generic/shmem/Makefile.am
diff --git a/platform/linux-generic/test/shmem/shmem.h b/test/platform/linux-generic/shmem/shmem.h
index 2368a2e1c..2368a2e1c 100644
--- a/platform/linux-generic/test/shmem/shmem.h
+++ b/test/platform/linux-generic/shmem/shmem.h
diff --git a/platform/linux-generic/test/shmem/shmem_common.h b/test/platform/linux-generic/shmem/shmem_common.h
index 16227ecd5..16227ecd5 100644
--- a/platform/linux-generic/test/shmem/shmem_common.h
+++ b/test/platform/linux-generic/shmem/shmem_common.h
diff --git a/platform/linux-generic/test/shmem/shmem_linux.c b/test/platform/linux-generic/shmem/shmem_linux.c
index 212a6c13a..212a6c13a 100644
--- a/platform/linux-generic/test/shmem/shmem_linux.c
+++ b/test/platform/linux-generic/shmem/shmem_linux.c
diff --git a/platform/linux-generic/test/shmem/shmem_linux.h b/test/platform/linux-generic/shmem/shmem_linux.h
index a07a7758f..a07a7758f 100644
--- a/platform/linux-generic/test/shmem/shmem_linux.h
+++ b/test/platform/linux-generic/shmem/shmem_linux.h
diff --git a/platform/linux-generic/test/shmem/shmem_odp.c b/test/platform/linux-generic/shmem/shmem_odp.c
index a1f750f89..a1f750f89 100644
--- a/platform/linux-generic/test/shmem/shmem_odp.c
+++ b/test/platform/linux-generic/shmem/shmem_odp.c
diff --git a/platform/linux-generic/test/shmem/shmem_odp.h b/test/platform/linux-generic/shmem/shmem_odp.h
index 614bbf805..614bbf805 100644
--- a/platform/linux-generic/test/shmem/shmem_odp.h
+++ b/test/platform/linux-generic/shmem/shmem_odp.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:50:02 +0000