ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile: Alter VPP_PYTHON_PREFIX for preloading deps

Browse Source 
Allow setting of VPP_PYTHON_PREFIX to alternate location
so the python prereqs can be installed into base image
Also added test-dep trigger to isolate dependency install
from actual test run

Change-Id: Ia80f5dbf71bc24eb46cd6586bcadd474ef822704
Signed-off-by: Ed Kern <ejk@cisco.com>
This commit is contained in:
Ed Kern
2018-04-02 16:42:48 -06:00
committed by Damjan Marion
parent 3ecc221162
commit 56ccc23fbc
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -330,7 +330,7 @@ wipe-release: test-wipe $(BR)/.deps.ok
rebuild-release: wipe-release build-release rebuild-release: wipe-release build-release
export VPP_PYTHON_PREFIX=$(BR)/python export VPP_PYTHON_PREFIX ?= $(BR)/python
libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
@ -377,6 +377,9 @@ test-shell:
test-shell-debug: test-shell-debug:
$(call test,vpp,vpp_debug,shell) $(call test,vpp,vpp_debug,shell)
test-dep:
@make -C test test-dep
test-doc: test-doc:
@make -C test doc @make -C test doc

2
test/Makefile
View File

@ -128,6 +128,8 @@ sanity: verify-no-running-vpp
ext: ext:
make -C ext make -C ext
test-dep: verify-python-path $(PAPI_INSTALL_DONE)
test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
$(call retest-func) $(call retest-func)