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.has...@linaro.org>
---
test/validation/Makefile.am | 4 +++-
test/validation/odp_pktio_run | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
index 0833181..e695e07 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 \
@@ -31,6 +31,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 6177caa..856dfac 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
--
2.1.1
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/lng-odp
