nat: use correct data types for memory sizes

[vpp.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 4dd77b9..6ba2e44 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -93,7 +93,7 @@ VENV_RUN_DIR:=$(VENV_PATH)/run
 endif
 
 ifeq ($(PYTHON),)
-PYTHON_INTERP=python3.6
+PYTHON_INTERP=python3
 else
 PYTHON_INTERP=$(PYTHON)
 endif
@@ -102,7 +102,7 @@ PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.m
 PIP_VERSION=19.1.1
 PIP_TOOLS_VERSION=3.8.0   # Keep in sync with requirements.txt
 PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
-SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/$(PYTHON_INTERP) -name site-packages)
+SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
 BUILD_COV_DIR=$(TEST_BR)/coverage
 
 PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION).done
@@ -141,11 +141,11 @@ $(PIP_INSTALL_DONE): $(PYTHON_DEPENDS)
 $(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
        @echo --- patching ---
        @sleep 1 # Ensure python recompiles patched *.py files -> *.pyc
-       for f in $(CURDIR)/patches/scapy-2.4/*.patch ; do \
+       for f in $(CURDIR)/patches/scapy-2.4.3/*.patch ; do \
                echo Applying patch: $$(basename $$f) ; \
                patch --forward -p1 -d $(SCAPY_SOURCE) < $$f ; \
                retCode=$$?; \
-               [ $$retCode -gt 1 ] && exit $$retCode; \
+               [ $$retCode -gt 0 ] && exit $$retCode; \
        done; \
        touch $@
 
@@ -241,8 +241,10 @@ shell: test-dep
        @echo "source $(VENV_PATH)/bin/activate;\
                cd $(BUILD_TEST_SRC);\
                export PYTHONPATH=$(BUILD_TEST_SRC);\
+               export RND_SEED=$(RND_SEED);\
                echo '***';\
                echo PYTHONPATH=$(BUILD_TEST_SRC);\
+               echo RND_SEED=$(RND_SEED);\
                echo VPP_BUILD_DIR=$(VPP_BUILD_DIR);\
                echo VPP_BIN=$(VPP_BIN);\
                echo VPP_PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
@@ -268,10 +270,8 @@ wipe: reset
        @rm -rf $(VENV_PATH)
        @rm -rf $(patsubst %,%/__pycache__, $(VPP_TEST_DIRS) $(BUILD_TEST_SRC))
 
-$(TEST_DOC_BR):
+$(TEST_DOC_BR): $(PIP_INSTALL_DONE)
        @mkdir -p $@
-       @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 html"
 
 .PHONY: doc