Use IP and MAC API types for neighbors

[vpp.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 9425743..8b1370f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -76,7 +76,7 @@ PYTHON_EXTRA_DEPENDS=
 endif
 
 PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt
-SCAPY_SOURCE=$(shell find $(VENV_PATH) -name site-packages)
+SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/$(PYTHON) -name site-packages)
 BUILD_COV_DIR=$(TEST_DIR)/coverage
 
 GET_PIP_SCRIPT=$(TEST_RUN_DIR)/get-pip.py
@@ -204,9 +204,9 @@ wipe: reset
        @rm -f $(PAPI_INSTALL_FLAGS)
 
 doc: verify-test-dir $(PIP_PATCH_DONE)
-       @virtualenv $(VENV_PATH) -p $(PYTHON_INTERP)
-       @bash -c "source $(VENV_PATH)/bin/activate && $(PYTHON_INTERP) -m pip install sphinx sphinx-rtd-theme"
-       @bash -c "source $(VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"
+       @virtualenv $(VENV_PATH) -p python3
+       @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install sphinx sphinx-rtd-theme"
+       @bash -c "source $(VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) html"
 
 .PHONY: wipe-doc
 
@@ -233,10 +233,10 @@ wipe-cov: wipe
 
 .PHONY: checkstyle
 checkstyle: verify-test-dir
-       @virtualenv $(VENV_PATH) -p $(PYTHON_INTERP)
-       @bash -c "source $(VENV_PATH)/bin/activate && $(PYTHON_INTERP) -m pip install pycodestyle"
+       @virtualenv $(VENV_PATH) -p python3
+       @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install pycodestyle"
        @bash -c "source $(VENV_PATH)/bin/activate &&\
-               pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 -v $(WS_ROOT)/test/*.py ||\
+               pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 --exclude=$(WS_ROOT)/test/_*.py -v $(WS_ROOT)/test/*.py ||\
                (echo \"*******************************************************************\" &&\
                 echo \"* Test framework PEP8 compliance check FAILED \" &&\
                 echo \"*******************************************************************\" &&\
@@ -260,6 +260,7 @@ help:
        @echo ""
        @echo "Arguments controlling test runs:"
        @echo " V=[0|1|2]            - set test verbosity level"
+       @echo "                        0=ERROR, 1=INFO, 2=DEBUG"
        @echo " TEST_JOBS=[<n>|auto] - use <n> parallel processes for test execution or automatic discovery of maximum acceptable processes (default: 1)"
        @echo " CACHE_OUTPUT=[0|1]   - cache VPP stdout/stderr and log as one block after test finishes (default: 1)"
        @echo " FAILFAST=[0|1]       - fail fast if 1, complete all tests if 0"