diff options
17 files changed, 11 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index c28b02291..dbf735dce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,9 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ --enable-helper-linux \ --with-testdir -if PLATFORM_IS_LINUX_GENERIC -PLATFORM_DIR = platform/linux-generic -PLATFORM_TEST_DIR = platform/linux-generic/test +if PLATFORM_IS_LINUX_DPDK +PLATFORM_DIR = platform/linux-dpdk +PLATFORM_TEST_DIR = platform/linux-dpdk/test endif SUBDIRS = \ diff --git a/platform/linux-dpdk/Makefile.inc b/platform/linux-dpdk/Makefile.inc index b20132b15..82962e5aa 100644 --- a/platform/linux-dpdk/Makefile.inc +++ b/platform/linux-dpdk/Makefile.inc @@ -2,4 +2,4 @@ AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_LDFLAGS += -R$(SDK_INSTALL_PATH)/lib -LOG_COMPILER = $(top_srcdir)/test/linux-dpdk/wrapper-script.sh +LOG_COMPILER = $(top_srcdir)/platform/linux-dpdk/test/wrapper-script.sh diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index 5bc22e4d0..fe2abe812 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -76,4 +76,6 @@ AC_SUBST([DPDK_PMDS]) CPPFLAGS=$OLD_CPPFLAGS AC_CONFIG_FILES([platform/linux-dpdk/Makefile - platform/linux-dpdk/include/odp/api/plat/static_inline.h]) + platform/linux-dpdk/include/odp/api/plat/static_inline.h + platform/linux-dpdk/test/Makefile + platform/linux-dpdk/test/validation/api/pktio/Makefile]) diff --git a/test/linux-dpdk/Makefile.am b/platform/linux-dpdk/test/Makefile.am index 4e9333b38..4e9333b38 100644 --- a/test/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/test/Makefile.am diff --git a/test/linux-dpdk/Makefile.inc b/platform/linux-dpdk/test/Makefile.inc index 7f1e2f2b7..7f1e2f2b7 100644 --- a/test/linux-dpdk/Makefile.inc +++ b/platform/linux-dpdk/test/Makefile.inc diff --git a/platform/linux-dpdk/test/validation/Makefile.inc b/platform/linux-dpdk/test/validation/Makefile.inc new file mode 100644 index 000000000..9a9cdca0f --- /dev/null +++ b/platform/linux-dpdk/test/validation/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/platform/linux-dpdk/test/Makefile.inc diff --git a/platform/linux-dpdk/test/validation/api/Makefile.inc b/platform/linux-dpdk/test/validation/api/Makefile.inc new file mode 100644 index 000000000..90ab675ca --- /dev/null +++ b/platform/linux-dpdk/test/validation/api/Makefile.inc @@ -0,0 +1 @@ +include $(top_srcdir)/platform/linux-dpdk/test/validation/Makefile.inc diff --git a/platform/linux-dpdk/test/validation/api/pktio/.gitignore b/platform/linux-dpdk/test/validation/api/pktio/.gitignore new file mode 120000 index 000000000..42a9f364e --- /dev/null +++ b/platform/linux-dpdk/test/validation/api/pktio/.gitignore @@ -0,0 +1 @@ +../../../../../linux-generic/test/validation/api/pktio/.gitignore
\ No newline at end of file diff --git a/test/linux-dpdk/validation/api/pktio/Makefile.am b/platform/linux-dpdk/test/validation/api/pktio/Makefile.am index e401a29af..e401a29af 100644 --- a/test/linux-dpdk/validation/api/pktio/Makefile.am +++ b/platform/linux-dpdk/test/validation/api/pktio/Makefile.am diff --git a/platform/linux-dpdk/test/validation/api/pktio/pktio_env b/platform/linux-dpdk/test/validation/api/pktio/pktio_env new file mode 120000 index 000000000..161505ff9 --- /dev/null +++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_env @@ -0,0 +1 @@ +../../../../../linux-generic/test/validation/api/pktio/pktio_env
\ No newline at end of file diff --git a/test/linux-dpdk/validation/api/pktio/pktio_run.sh b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh index 538c87d00..538c87d00 100755 --- a/test/linux-dpdk/validation/api/pktio/pktio_run.sh +++ b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh diff --git a/test/linux-dpdk/wrapper-script.sh b/platform/linux-dpdk/test/wrapper-script.sh index 0dc2d23c2..0dc2d23c2 100755 --- a/test/linux-dpdk/wrapper-script.sh +++ b/platform/linux-dpdk/test/wrapper-script.sh diff --git a/test/linux-dpdk/.gitignore b/test/linux-dpdk/.gitignore deleted file mode 100644 index 5dabf91c1..000000000 --- a/test/linux-dpdk/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.log -*.trs -tests-validation.env diff --git a/test/linux-dpdk/m4/configure.m4 b/test/linux-dpdk/m4/configure.m4 deleted file mode 100644 index ff6caf97a..000000000 --- a/test/linux-dpdk/m4/configure.m4 +++ /dev/null @@ -1,2 +0,0 @@ -AC_CONFIG_FILES([test/linux-dpdk/Makefile - test/linux-dpdk/validation/api/pktio/Makefile]) diff --git a/test/linux-dpdk/run-test b/test/linux-dpdk/run-test deleted file mode 120000 index 332cf3fee..000000000 --- a/test/linux-dpdk/run-test +++ /dev/null @@ -1 +0,0 @@ -../linux-generic/run-test
\ No newline at end of file diff --git a/test/linux-dpdk/validation/api/pktio/.gitignore b/test/linux-dpdk/validation/api/pktio/.gitignore deleted file mode 120000 index 559053e1d..000000000 --- a/test/linux-dpdk/validation/api/pktio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -../../../../linux-generic/validation/api/pktio/.gitignore
\ No newline at end of file diff --git a/test/linux-dpdk/validation/api/pktio/pktio_env b/test/linux-dpdk/validation/api/pktio/pktio_env deleted file mode 120000 index 271cefee1..000000000 --- a/test/linux-dpdk/validation/api/pktio/pktio_env +++ /dev/null @@ -1 +0,0 @@ -../../../../linux-generic/validation/api/pktio/pktio_env
\ No newline at end of file |