X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=f78c8a8ca69bdca18a3ac862e3c7640643074d90;hb=712dde9cec41beef3b4252a8cf14f98b674a8d79;hp=9113d15f703b21cef99bd0ca3bea61b3dc3f4c5e;hpb=64abeecaddf778d194f5f69e7bfb06a52e373d49;p=vpp.git

diff --git a/test/Makefile b/test/Makefile
index 9113d15f703..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
@@ -178,10 +174,10 @@ retest: verify-test-dir sanity reset
 shell: verify-test-dir $(PAPI_INSTALL_DONE)
 	@echo "source $(VENV_PATH)/bin/activate;\
 		echo '***';\
-		echo _BUILD_DIR=$(VPP_BUILD_DIR);\
-		echo _BIN=$(VPP_BIN);\
-		echo _PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
-		echo _INSTALL_PATH=$(VPP_INSTALL_PATH);\
+		echo VPP_BUILD_DIR=$(VPP_BUILD_DIR);\
+		echo VPP_BIN=$(VPP_BIN);\
+		echo VPP_PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
+		echo VPP_INSTALL_PATH=$(VPP_INSTALL_PATH);\
 		echo EXTERN_TESTS=$(EXTERN_TESTS);\
 		echo EXTERN_PLUGINS=$(EXTERN_PLUGINS);\
                 echo EXTERN_COV_DIR=$(EXTERN_COV_DIR);\
@@ -213,11 +209,11 @@ wipe-doc:
 	@make -C doc wipe BR=$(BR)
 
 cov: wipe-cov reset ext verify-test-dir $(PAPI_INSTALL_DONE)
-	@lcov --zerocounters --directory $(_BUILD_DIR)
+	@lcov --zerocounters --directory $(VPP_BUILD_DIR)
 	@test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR)
 	$(call retest-func)
 	@mkdir $(BUILD_COV_DIR)
-	@lcov --capture --directory $(_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
+	@lcov --capture --directory $(VPP_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
 	@test -z "$(EXTERN_COV_DIR)" || lcov --capture --directory $(EXTERN_COV_DIR) --output-file $(BUILD_COV_DIR)/extern-coverage.info
 	@genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
 	@test -z "$(EXTERN_COV_DIR)" || genhtml $(BUILD_COV_DIR)/extern-coverage.info --output-directory $(BUILD_COV_DIR)/extern-html