classify: add complex encap packet tracing test

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index c13c564..ff523ed 100644 (file)
--- 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
@@ -697,7 +684,7 @@ docs-venv:
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv)
 
 .PHONY: docs
-docs: $(DOCS_DIR) docs-venv
+docs: $(DOCS_DIR)
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html)
 
 .PHONY: docs-clean