Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
---
helper/test/Makefile.am | 2 +-
platform/linux-generic/test/Makefile.am | 3 ++-
test/Makefile.inc | 2 ++
test/performance/Makefile.am | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index 9ac82eb..4e437ec 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/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} TEST_DIR=${builddir}
+TESTS_ENVIRONMENT += TEST_DIR=${builddir}
EXECUTABLES = odp_chksum$(EXEEXT) \
odp_thread$(EXEEXT) \
diff --git a/platform/linux-generic/test/Makefile.am
b/platform/linux-generic/test/Makefile.am
index 0ef1c44..c063295 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -1,4 +1,5 @@
-TESTS_ENVIRONMENT = TEST_DIR=${top_builddir}/test/validation
+include $(top_srcdir)/test/Makefile.inc
+TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
ODP_MODULES = pktio
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 1eb6ed5..6cdd0db 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -20,3 +20,5 @@ AM_LDFLAGS += -L$(LIB)
@VALGRIND_CHECK_RULES@
valgrind_tools = memcheck drd sgcheck
+
+TESTS_ENVIRONMENT= ODP_PLATFORM=${with_platform}
\ No newline at end of file
diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
index fc37305..ae2973e 100644
--- a/test/performance/Makefile.am
+++ b/test/performance/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/test/Makefile.inc
-TESTS_ENVIRONMENT = TEST_DIR=${builddir} ODP_PLATFORM=${with_platform}
+TESTS_ENVIRONMENT += TEST_DIR=${builddir}
EXECUTABLES = odp_atomic$(EXEEXT) odp_pktio_perf$(EXEEXT)
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
