make test: create virtualenv under /test/
instead of using build-root, use /test/venv directory for virtualenv
similarly, don't pollute build-root with test-built binaries
Change-Id: I1e63c04037eaee718b27b34ef16c9eb0252afa53
Signed-off-by: Klement Sekera <ksekera@cisco.com>
diff --git a/Makefile b/Makefile
index e0c710f..d5cc9f3 100644
--- a/Makefile
+++ b/Makefile
@@ -370,19 +370,18 @@
rebuild-release: wipe-release build-release
-export VPP_PYTHON_PREFIX ?= $(BR)/python
-
libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
+export TEST_DIR ?= $(WS_ROOT)/test
+
define test
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
$(eval libs:=lib lib64)
make -C test \
- TEST_DIR=$(WS_ROOT)/test \
- VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
- VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
- VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
- VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
+ VPP_BUILD_DIR=$(BR)/build-$(2)-native \
+ VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
+ VPP_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
+ VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \
LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
EXTENDED_TESTS=$(EXTENDED_TESTS) \
PYTHON=$(PYTHON) \
@@ -398,7 +397,7 @@
$(call test,vpp,vpp_debug,test)
test-all:
- $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
+ $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install japi-install,)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp,test)