aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-02-20 09:51:54 -0800
committerOle Trøan <otroan@employees.org>2019-02-26 11:06:03 +0000
commitd73dbd2d3a2437c1bb687d70a5872065a67fbb6c (patch)
tree984e1ae31f7b70cb9dc2f0161dba7027b6c98443 /test
parent38a4ec7342c27e675cc049d923e0075655fd91fd (diff)
make test: Stop downloading pip.
Use the installed version of pip. If a newer version of pip is needed, it can be specified in requirements.txt. This is to improve idempotence by providing some control over upstream changes. Change-Id: I07b7651f8ddba6005bf85d11fef9e3343ee2dcd2 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/Makefile b/test/Makefile
index a032318dbca..f78c8a8ca69 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -79,7 +79,6 @@ PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt
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
PIP_INSTALL_DONE=$(TEST_RUN_DIR)/pip-install.done
PIP_PATCH_DONE=$(TEST_RUN_DIR)/pip-patch.done
PAPI_INSTALL_DONE=$(TEST_RUN_DIR)/papi-install.done
@@ -92,11 +91,8 @@ else
PYTHON_INTERP=$(PYTHON)
endif
-$(GET_PIP_SCRIPT):
+$(PIP_INSTALL_DONE):
@mkdir -p $(TEST_RUN_DIR)
- @bash -c "cd $(TEST_RUN_DIR) && curl -O https://bootstrap.pypa.io/get-pip.py"
-
-$(PIP_INSTALL_DONE): $(GET_PIP_SCRIPT)
@virtualenv $(VENV_PATH) -p $(PYTHON_INTERP)
@bash -c "source $(VENV_PATH)/bin/activate && $(PYTHON_INTERP) -m pip install $(PYTHON_DEPENDS)"
@touch $@
@@ -111,7 +107,7 @@ $(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@touch $@
$(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
- @bash -c "source $(VENV_PATH)/bin/activate && cd $(WS_ROOT)/src/vpp-api/python && $(PYTHON_INTERP) setup.py install"
+ @bash -c "source $(VENV_PATH)/bin/activate && $(PYTHON_INTERP) -m pip install -e $(WS_ROOT)/src/vpp-api/python"
@touch $@
define retest-func