diff options
author | Balakrishna Garapati <balakrishna.garapati@linaro.org> | 2016-10-20 16:18:23 +0200 |
---|---|---|
committer | Balakrishna Garapati <balakrishna.garapati@linaro.org> | 2016-10-20 16:48:57 +0200 |
commit | 7d7e70e7f4fc10cf582c429f4bf9a6506055a4a7 (patch) | |
tree | 051ec378aaa7bb56320ae3411e57a07e4dec8053 | |
parent | d0cc871fb014e3f5b9d9622af1f351163d3b2b16 (diff) |
linux-dpdk: test: move tests into test suite
This is a Revert for the commit:
3549864cc186c61e468b9efbe19baa18ec75f410
and syncs with odp monarch_lts release
Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
15 files changed, 6 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 656246cfc..9167c3219 100644 --- a/configure.ac +++ b/configure.ac @@ -113,22 +113,6 @@ AC_SUBST([with_platform]) AC_SUBST([platform_with_platform], ["platform/${with_platform}"]) ########################################################################## -# Run platform specific checks and settings -########################################################################## -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}" - exit 1 -fi - -ODP_CFLAGS="$ODP_CFLAGS -DIMPLEMENTATION_NAME=$IMPLEMENTATION_NAME" - -########################################################################## # Include m4 files ########################################################################## m4_include([./doc/m4/configure.m4]) @@ -158,7 +142,7 @@ IMPLEMENTATION_NAME="" if test "${with_platform}" == "linux-dpdk"; then m4_include([./platform/linux-dpdk/m4/configure.m4]) - m4_include([./test/linux-dpdk/m4/configure.m4]) + m4_include([./test/platform/linux-dpdk/m4/configure.m4]) IMPLEMENTATION_NAME="odp-dpdk" else echo "UNSUPPORTED PLATFORM: ${with_platform}" diff --git a/platform/linux-dpdk/Makefile.inc b/platform/linux-dpdk/Makefile.inc index 45f7265e3..e933b93d1 100644 --- a/platform/linux-dpdk/Makefile.inc +++ b/platform/linux-dpdk/Makefile.inc @@ -1,4 +1,4 @@ AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_LDFLAGS += -R$(SDK_INSTALL_PATH)/lib -LOG_COMPILER = $(top_srcdir)/platform/linux-dpdk/test/wrapper-script.sh +LOG_COMPILER = $(top_srcdir)/test/platform/linux-dpdk/wrapper-script.sh diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index 1f1c67690..aeaebcd42 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -76,7 +76,5 @@ LDFLAGS=$OLD_LDFLAGS CPPFLAGS=$OLD_CPPFLAGS AC_CONFIG_FILES([platform/linux-dpdk/Makefile - platform/linux-dpdk/test/Makefile - platform/linux-dpdk/test/pktio/Makefile platform/linux-dpdk/include/odp/api/inlines.h]) diff --git a/platform/linux-dpdk/test/.gitignore b/platform/linux-dpdk/test/.gitignore deleted file mode 100644 index 5dabf91c1..000000000 --- a/platform/linux-dpdk/test/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.log -*.trs -tests-validation.env diff --git a/platform/linux-dpdk/test/pktio/pktio_env b/platform/linux-dpdk/test/pktio/pktio_env deleted file mode 120000 index 6244f7156..000000000 --- a/platform/linux-dpdk/test/pktio/pktio_env +++ /dev/null @@ -1 +0,0 @@ -../../../../platform/linux-generic/test/pktio/pktio_env
\ No newline at end of file diff --git a/platform/linux-dpdk/test/run-test b/platform/linux-dpdk/test/run-test deleted file mode 120000 index 188283edb..000000000 --- a/platform/linux-dpdk/test/run-test +++ /dev/null @@ -1 +0,0 @@ -../../linux-generic/test/run-test
\ No newline at end of file diff --git a/platform/linux-dpdk/test/Makefile.am b/test/platform/linux-dpdk/Makefile.am index a2edf0cb8..a2edf0cb8 100644 --- a/platform/linux-dpdk/test/Makefile.am +++ b/test/platform/linux-dpdk/Makefile.am diff --git a/platform/linux-dpdk/test/Makefile.inc b/test/platform/linux-dpdk/Makefile.inc index a54d17856..a54d17856 100644 --- a/platform/linux-dpdk/test/Makefile.inc +++ b/test/platform/linux-dpdk/Makefile.inc diff --git a/test/platform/linux-dpdk/m4/configure.m4 b/test/platform/linux-dpdk/m4/configure.m4 new file mode 100644 index 000000000..bb4fcd657 --- /dev/null +++ b/test/platform/linux-dpdk/m4/configure.m4 @@ -0,0 +1,2 @@ +AC_CONFIG_FILES([test/platform/linux-dpdk/Makefile + test/platform/linux-dpdk/pktio/Makefile]) diff --git a/platform/linux-dpdk/test/pktio/.gitignore b/test/platform/linux-dpdk/pktio/.gitignore index 563cb9228..563cb9228 120000 --- a/platform/linux-dpdk/test/pktio/.gitignore +++ b/test/platform/linux-dpdk/pktio/.gitignore diff --git a/platform/linux-dpdk/test/pktio/Makefile.am b/test/platform/linux-dpdk/pktio/Makefile.am index e401a29af..e401a29af 100644 --- a/platform/linux-dpdk/test/pktio/Makefile.am +++ b/test/platform/linux-dpdk/pktio/Makefile.am diff --git a/test/platform/linux-dpdk/pktio/pktio_env b/test/platform/linux-dpdk/pktio/pktio_env new file mode 120000 index 000000000..0d56f0914 --- /dev/null +++ b/test/platform/linux-dpdk/pktio/pktio_env @@ -0,0 +1 @@ +../../linux-generic/pktio/pktio_env
\ No newline at end of file diff --git a/platform/linux-dpdk/test/pktio/pktio_run.sh b/test/platform/linux-dpdk/pktio/pktio_run.sh index 957c2bb44..957c2bb44 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run.sh +++ b/test/platform/linux-dpdk/pktio/pktio_run.sh diff --git a/test/platform/linux-dpdk/run-test b/test/platform/linux-dpdk/run-test new file mode 120000 index 000000000..332cf3fee --- /dev/null +++ b/test/platform/linux-dpdk/run-test @@ -0,0 +1 @@ +../linux-generic/run-test
\ No newline at end of file diff --git a/platform/linux-dpdk/test/wrapper-script.sh b/test/platform/linux-dpdk/wrapper-script.sh index 79ef6ffba..79ef6ffba 100755 --- a/platform/linux-dpdk/test/wrapper-script.sh +++ b/test/platform/linux-dpdk/wrapper-script.sh |