X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=0369018af2fa1acf3f7e8ff9a1f11aeb6454b44c;hb=abec0129b17797170d59521e0ad8b5f6d5853643;hp=5f456e172c42ac7f0c58494a1b0b7230aff8993e;hpb=b4515b4be4ead1ea5d0af205989cf313272e8770;p=vpp.git diff --git a/test/Makefile b/test/Makefile index 5f456e172c4..0369018af2f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -73,7 +73,7 @@ PYTHON_EXTRA_DEPENDS= endif PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv -PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) psutil faulthandler six scapy==2.4.0 pexpect cryptography subprocess32 cffi syslog-rfc5424-parser git+https://github.com/vpp-dev/py-lispnetworking +PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt SCAPY_SOURCE=$(shell find $(PYTHON_VENV_PATH) -name site-packages) BUILD_COV_DIR=$(BR)/test-cov @@ -162,14 +162,13 @@ sanity: verify-no-running-vpp .PHONY: ext ext: - make -C ext + @if [ "$(EXTENDED_TESTS)" = "yes" ]; then\ + make -C ext;\ + fi test-dep: verify-python-path $(PAPI_INSTALL_DONE) -test: verify-python-path $(PAPI_INSTALL_DONE) sanity reset - $(call retest-func) - -test-ext: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset +test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset $(call retest-func) retest: verify-python-path sanity reset