make test: improve documentation and PEP8 compliance

[vpp.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 54fe058..543fe91 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,7 +17,7 @@ PAPI_INSTALL_DONE=$(VPP_PYTHON_PREFIX)/papi-install.done
 PAPI_INSTALL_FLAGS=$(PIP_INSTALL_DONE) $(PIP_PATCH_DONE) $(PAPI_INSTALL_DONE)
 
 $(PIP_INSTALL_DONE):
-       @virtualenv $(PYTHON_VENV_PATH)
+       @virtualenv $(PYTHON_VENV_PATH) -p python2.7
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS)"
        @touch $@
 
@@ -30,7 +30,7 @@ $(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
        @touch $@
 
 $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
-       @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/vpp-api/python && python setup.py install"
+       @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && cd $(WS_ROOT)/src/vpp-api/python && python setup.py install"
        @touch $@
 
 define retest-func
@@ -54,7 +54,7 @@ wipe: reset
        @rm -f $(PAPI_INSTALL_FLAGS)
 
 doc: verify-python-path
-       @virtualenv $(PYTHON_VENV_PATH)
+       @virtualenv $(PYTHON_VENV_PATH) -p python2.7
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS) sphinx"
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) NO_VPP_PAPI=1 html"