X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=ff523ed537e8a5467bbcaa1ac9c1de4de4576bf8;hb=71a70d73f34f7c057dd95dbca39fb8e602087a75;hp=dc7583eb2a1316996c52719b09cafef9ae5646ef;hpb=e7906906079ca2d67bf67cfa9939523213230b56;p=vpp.git

diff --git a/Makefile b/Makefile
index dc7583eb2a1..ff523ed537e 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
 DEB_DEPENDS += python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml yamllint
+DEB_DEPENDS += python3-venv  # ensurepip
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -187,18 +188,7 @@ help:
 	@echo " run-release          - run release binary"
 	@echo " debug                - run debug binary with debugger"
 	@echo " debug-release        - run release binary with debugger"
-	@echo " test                 - build and run (basic) functional tests"
-	@echo " test-debug           - build and run (basic) functional tests (debug build)"
-	@echo " test-all             - build and run functional and extended tests"
-	@echo " test-all-debug       - build and run functional and extended tests (debug build)"
-	@echo " test-gcov            - build and run functional tests (gcov build)"
-	@echo " test-shell           - enter shell with test environment"
-	@echo " test-shell-debug     - enter shell with test environment (debug build)"
-	@echo " test-wipe            - wipe files generated by unit tests"
-	@echo " retest               - run functional tests"
-	@echo " retest-debug         - run functional tests (debug build)"
-	@echo " test-all             - run functional and extended tests"
-	@echo " test-all-debug       - run functional and extended tests (debug build)"
+	@echo " test                 - build and run tests"
 	@echo " test-help            - show help on test framework"
 	@echo " run-vat              - run vpp-api-test tool"
 	@echo " pkg-deb              - build DEB packages"
@@ -224,13 +214,6 @@ help:
 	@echo " docs                 - Build the Sphinx documentation"
 	@echo " docs-venv            - Build the virtual environment for the Sphinx docs"
 	@echo " docs-clean           - Remove the generated files from the Sphinx docs"
-	@echo " test-doc             - generate documentation for test framework"
-	@echo " test-wipe-doc        - wipe documentation for test framework"
-	@echo " test-cov             - generate code coverage report for test framework"
-	@echo " test-wipe-cov        - wipe code coverage report for test framework"
-	@echo " test-wipe-papi       - wipe test framework papi test code"
-	@echo " test-checkstyle      - check PEP8 compliance for test framework"
-	@echo " test-refresh-deps    - refresh the Python dependencies for the tests"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]                  - set build verbosity level"
@@ -493,6 +476,10 @@ test-cov:
 test-wipe-cov:
 	@make -C test wipe-cov
 
+.PHONY: test-wipe-all
+test-wipe-all:
+	@make -C test wipe-all
+
 .PHONY: test-checkstyle
 test-checkstyle:
 	@make -C test checkstyle
@@ -680,7 +667,7 @@ bootstrap-doxygen:
 	$(call make-doxy)
 
 .PHONY: doxygen
-doxygen:
+doxygen: bootstrap-doxygen
 	$(call make-doxy)
 
 .PHONY: wipe-doxygen
@@ -702,7 +689,8 @@ docs: $(DOCS_DIR)
 
 .PHONY: docs-clean
 docs-clean:
-	@($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
+	@rm -rf $(DOCS_DIR)/_build
+	@rm -rf $(VENV_DIR)
 
 .PHONY: pkg-verify
 pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps