X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=3a78a3f08af059ee7ce1476d10e477aa866bb3ff;hb=9efcee6e7babd49999af3e3dcd13ee33d0a4c02d;hp=abc611c44d90f58e8f0d0603929e10d829b3f7d8;hpb=2456433df46ae99dfbcec6260d14e592b5823c83;p=vpp.git diff --git a/test/Makefile b/test/Makefile index abc611c44d9..3a78a3f08af 100644 --- a/test/Makefile +++ b/test/Makefile @@ -78,7 +78,7 @@ TEST_RUN_DIR:=$(VENV_PATH)/run endif ifeq ($(PYTHON),) -PYTHON_INTERP=python2.7 +PYTHON_INTERP=python3.6 else PYTHON_INTERP=$(PYTHON) endif @@ -234,8 +234,8 @@ wipe: reset @rm -f $(PAPI_INSTALL_FLAGS) doc: verify-test-dir $(PIP_PATCH_DONE) - @virtualenv $(VENV_PATH) -p python3 - @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install sphinx sphinx-rtd-theme" + @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 WS_ROOT=$(WS_ROOT) BR=$(BR) html" .PHONY: wipe-doc @@ -267,9 +267,9 @@ papi-wipe: @rm -rf $(PAPI_INSTALL_DONE) .PHONY: checkstyle -checkstyle: verify-test-dir - @virtualenv $(VENV_PATH) -p python3 - @bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install pycodestyle" +checkstyle: verify-test-dir $(PIP_INSTALL_DONE) + @bash -c "source $(VENV_PATH)/bin/activate &&\ + $(PYTHON_INTERP) -m pip install pycodestyle" @bash -c "source $(VENV_PATH)/bin/activate &&\ pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 --exclude=$(WS_ROOT)/test/_*.py -v $(WS_ROOT)/test/*.py $(PLUGIN_SRC_DIR)/*/test/*.py ||\ (echo \"*******************************************************************\" &&\ @@ -341,6 +341,8 @@ help: @echo "" @echo " SOCKET=1 - Communicate with VPP over Unix domain socket instead of SHM" @echo "" + @echo " RND_SEED=seed - Seed RND with given seed" + @echo "" @echo "Creating test documentation" @echo " test-doc - generate documentation for test framework" @echo " test-wipe-doc - wipe documentation for test framework"