diff options
| author | Matias Elo <matias.elo@nokia.com> | 2018-02-01 11:28:28 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2018-02-01 17:48:53 +0200 |
| commit | 04cc3fc4ec76ea84638133f12b106f5850f81f3b (patch) | |
| tree | 0aa7e5727693b0e1723372147f094998a2ccf1d6 /platform/linux-dpdk/test | |
| parent | bab7aca5880bf759e54ce4c4a6f5d4cb3bbc278f (diff) | |
Port 326192c "test: drop now-unused common_plat directory"
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'platform/linux-dpdk/test')
| -rw-r--r-- | platform/linux-dpdk/test/Makefile.am | 2 | ||||
| -rw-r--r-- | platform/linux-dpdk/test/Makefile.inc | 4 | ||||
| -rwxr-xr-x | platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/linux-dpdk/test/Makefile.am b/platform/linux-dpdk/test/Makefile.am index 4e9333b38..8cb27b14f 100644 --- a/platform/linux-dpdk/test/Makefile.am +++ b/platform/linux-dpdk/test/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = diff --git a/platform/linux-dpdk/test/Makefile.inc b/platform/linux-dpdk/test/Makefile.inc index 7f1e2f2b7..60f52b892 100644 --- a/platform/linux-dpdk/test/Makefile.inc +++ b/platform/linux-dpdk/test/Makefile.inc @@ -6,11 +6,11 @@ AM_LDFLAGS = -static AM_CFLAGS = $(CUNIT_CFLAGS) -LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la +LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la $(DPDK_PMDS) -INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common +INCCUNIT_COMMON = -I$(top_srcdir)/test/common INCODP = -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/helper/include \ diff --git a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh b/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh index 538c87d00..a08256a6b 100755 --- a/platform/linux-dpdk/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-dpdk/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/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) |