Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MAP: Move MAP-E/T to a plugin.
[vpp.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
b570e50
..
4e2863c
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-54,7
+54,7
@@
PYTHON_EXTRA_DEPENDS=
endif
PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
endif
PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
-PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) faulthandler six scapy==2.
3.3 pexpect pycrypto subprocess32 cffi git+https://github.com/klement/py-lispnetworking@setup
+PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) faulthandler six scapy==2.
4.0 pexpect cryptography subprocess32 cffi git+https://github.com/vpp-dev/py-lispnetworking
SCAPY_SOURCE=$(shell find $(PYTHON_VENV_PATH) -name site-packages)
BUILD_COV_DIR=$(BR)/test-cov
SCAPY_SOURCE=$(shell find $(PYTHON_VENV_PATH) -name site-packages)
BUILD_COV_DIR=$(BR)/test-cov
@@
-84,7
+84,7
@@
$(PIP_INSTALL_DONE): $(GET_PIP_SCRIPT)
$(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@echo --- patching ---
@sleep 1 # Ensure python recompiles patched *.py files -> *.pyc
$(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@echo --- patching ---
@sleep 1 # Ensure python recompiles patched *.py files -> *.pyc
- for f in $(CURDIR)/patches/scapy-2.
3.3
/*.patch ; do \
+ for f in $(CURDIR)/patches/scapy-2.
4
/*.patch ; do \
echo Applying patch: $$(basename $$f) ; \
patch -p1 -d $(SCAPY_SOURCE) < $$f ; \
done
echo Applying patch: $$(basename $$f) ; \
patch -p1 -d $(SCAPY_SOURCE) < $$f ; \
done
@@
-128,6
+128,8
@@
sanity: verify-no-running-vpp
ext:
make -C ext
ext:
make -C ext
+test-dep: verify-python-path $(PAPI_INSTALL_DONE)
+
test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
$(call retest-func)
test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
$(call retest-func)
@@
-194,7
+196,7
@@
checkstyle: verify-python-path
@virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pycodestyle"
@bash -c "source $(PYTHON_VENV_PATH)/bin/activate &&\
@virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pycodestyle"
@bash -c "source $(PYTHON_VENV_PATH)/bin/activate &&\
- pycodestyle --show-source --ignore=E126,E241,E226,E305,E704,E741,E722 -v $(WS_ROOT)/test/*.py ||\
+ pycodestyle --show-source --ignore=
W504,
E126,E241,E226,E305,E704,E741,E722 -v $(WS_ROOT)/test/*.py ||\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\