aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorStuart Haslam <stuart.haslam@linaro.org>2015-03-17 10:31:54 +0000
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-03-20 12:24:57 +0300
commit681336670799981137bc52813a9ee98ee4271c6b (patch)
treeec3b150b9a041f375e7cc277477b04a4c26c2c30 /test
parent0ab0a4e4d1cfc8ed650da20a3d8b4eee816e6c09 (diff)
validation: pktio: add support for VPATH builds
Running "make check" in a VPATH build fails as the odp_pktio_run script incorrectly assumes that the odp_pktio binary is in the same directory. Resolve this by passing the path to the test binary to the script via the TESTS_ENVIRONMENT variable. Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org> Tested-by: Mike Holmes <mike.holmes@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'test')
-rw-r--r--test/validation/Makefile.am4
-rwxr-xr-xtest/validation/odp_pktio_run2
2 files changed, 4 insertions, 2 deletions
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
index 0fee1d5f1..81e6f2dd3 100644
--- a/test/validation/Makefile.am
+++ b/test/validation/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/test/Makefile.inc
AM_CFLAGS += -I$(srcdir)/common
AM_LDFLAGS += -static
-TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform}
+TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} TEST_DIR=${builddir}
EXECUTABLES = odp_buffer \
odp_classification \
@@ -32,6 +32,8 @@ if test_vald
TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
endif
+dist_bin_SCRIPTS = odp_pktio_run
+
bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
ODP_CU_COMMON=common/odp_cunit_common.c
diff --git a/test/validation/odp_pktio_run b/test/validation/odp_pktio_run
index 204b440e3..b725a5f56 100755
--- a/test/validation/odp_pktio_run
+++ b/test/validation/odp_pktio_run
@@ -27,7 +27,7 @@
# (repeat running test multiple times..)
# odp_pktio_run cleanup
#
-TEST_DIR=$(dirname $0)
+TEST_DIR="${TEST_DIR:-$(dirname $0)}"
IF0=pktio-p0
IF1=pktio-p1