diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2024-07-23 01:28:19 -0400 |
|---|---|---|
| committer |   Beno�t Ganne <bganne@cisco.com> | 2024-08-07 09:15:17 +0000 |
| commit | cf9356d642ce131c6562fcd281c01e51af888ec3 (patch) | |
| tree | 8a57da79b102ee9a6c4fa3d8c834591ddfdbaff0 /test/Makefile | |
| parent | 0a3b0b231d8d2978c3322cc5ba8e1d2746a6d730 (diff) | |
tests: update scapy to version 2.4.5
- Required for Ubuntu 24.04 LTS jobs
- temporarily disable TestIpsecEsp1 and
TestIpsecAhAll tests until a patch can
be added to fix them
Type: test
Change-Id: I1ae7b170117182c3252629bbbb770775e2c496c9
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/Makefile b/test/Makefile index 5439083d7c1..bc5bc0cf129 100644 --- a/test/Makefile +++ b/test/Makefile @@ -74,12 +74,13 @@ V=0 endif PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)') -PIP_VERSION=24.0 +PIP_VERSION=24.2 # Keep in sync with requirements.txt PIP_TOOLS_VERSION=7.4.1 -PIP_SETUPTOOLS_VERSION=69.2.0 +PIP_SETUPTOOLS_VERSION=71.1.0 PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages) +SCAPY_VERSION=$(shell grep scapy $(TEST_DIR)/requirements.txt | cut -d'=' -f3 | cut -d';' -f1) BUILD_COV_DIR=$(BR)/test-coverage PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION)-$(PIP_TOOLS_VERSION).done @@ -118,7 +119,7 @@ $(PIP_INSTALL_DONE): $(PIP_TOOLS_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.3/*.patch ; do \ + for f in $(CURDIR)/patches/scapy-$(SCAPY_VERSION)/*.patch ; do \ echo Applying patch: $$(basename $$f) ; \ patch --forward -p1 -d $(SCAPY_SOURCE) < $$f ; \ retCode=$$?; \ |