X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=5616e9c3e55376982cdf6c9b58a0abb6960ee3e1;hb=e15245d79d67f842c4b35f0a382d85a264c795a0;hp=82095883b55d04a40a48dc812b698b1ab719b4ea;hpb=eddd8e3588561039985b27edf059db6033bfdfab;p=vpp.git

diff --git a/test/Makefile b/test/Makefile
index 82095883b55..5616e9c3e55 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,6 @@ ifndef TEST_DIR
 endif
 
 export TEST_BR = $(TEST_DIR)
-export TEST_DOC_BR = $(TEST_DIR)/doc/build
 FAILED_DIR=/tmp/vpp-failed-unittests/
 VPP_TEST_DIRS=$(shell ls -d $(TEST_DIR) $(EXTERN_TESTS))
 
@@ -81,9 +80,9 @@ PYTHON_INTERP=$(PYTHON)
 endif
 
 PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)')
-PIP_VERSION=20.1.1
+PIP_VERSION=21.3.1
 # Keep in sync with requirements.txt
-PIP_TOOLS_VERSION=5.1.2
+PIP_TOOLS_VERSION=6.4.0
 PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
 SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
 BUILD_COV_DIR=$(TEST_BR)/coverage
@@ -194,10 +193,6 @@ sanity: test-dep
 	         echo \"*******************************************************************\" &&\
 		 false)"
 
-.PHONY: ext-test-apps
-ext-test-apps:
-	make -C ext test-apps
-
 $(FAILED_DIR): reset
 	@mkdir -p $@
 
@@ -205,7 +200,7 @@ $(FAILED_DIR): reset
 test-dep: $(PAPI_INSTALL_DONE) $(FAILED_DIR)
 
 .PHONY: test
-test: test-dep ext-test-apps sanity
+test: test-dep sanity
 	$(call retest-func)
 
 .PHONY: retest
@@ -240,25 +235,9 @@ reset:
 
 .PHONY: wipe
 wipe: reset
-	@make -C ext clean
 	@rm -rf $(VENV_PATH)
 	@rm -rf $(patsubst %,%/__pycache__, $(VPP_TEST_DIRS))
 
-$(TEST_DOC_BR): $(PIP_INSTALL_DONE)
-	@mkdir -p $@
-	@bash -c "source $(VENV_PATH)/bin/activate && make -C doc html"
-
-.PHONY: doc
-doc: $(PIP_PATCH_DONE) $(TEST_DOC_BR)
-	@echo
-	@echo "Test Documentation URL: $(TEST_DOC_BR)/html/index.html"
-	@echo "Run 'make test-wipe-doc test-doc' to rebuild the test docs"
-	@echo
-
-.PHONY: wipe-doc
-wipe-doc:
-	@rm -rf $(TEST_DOC_BR)
-
 $(BUILD_COV_DIR):
 	@mkdir -p $@
 
@@ -284,7 +263,7 @@ wipe-papi:
 	@rm -rf $(PAPI_INSTALL_DONE) $(PAPI_WIPE_DIST)
 
 .PHONY: wipe-all
-wipe-all: wipe wipe-papi wipe-doc wipe-cov
+wipe-all: wipe wipe-papi wipe-cov
 	@rm -rf $(TEST_BR)
 
 .PHONY: checkstyle-diff
@@ -338,9 +317,8 @@ help:
 	@echo " test-gcov                      - build and run functional tests (gcov build)"
 	@echo " test-wipe              - wipe (temporary) files generated by unit tests"
 	@echo " test-wipe-cov          - wipe code coverage report for test framework"
-	@echo " test-wipe-doc          - wipe documentation for test framework"
 	@echo " test-wipe-papi         - rebuild vpp_papi sources"
-	@echo " test-wipe-all          - wipe (temporary) files generated by unit tests, docs, and coverage"
+	@echo " test-wipe-all          - wipe (temporary) files generated by unit tests, and coverage"
 	@echo " test-shell             - enter shell with test environment"
 	@echo " test-shell-debug       - enter shell with test environment (debug build)"
 	@echo " test-checkstyle        - check PEP8 compliance for test framework"
@@ -410,10 +388,6 @@ help:
 	@echo " VPP_IN_GDB_NO_RMDIR=0  - don't remove existing tmp dir but fail instead"
 	@echo " VPP_IN_GDB_CMDLINE=1   - add 'interactive' to VPP arguments to run with command line"
 	@echo ""
-	@echo "Creating test documentation"
-	@echo " test-doc               - generate documentation for test framework"
-	@echo " test-wipe-doc          - wipe documentation for test framework"
-	@echo ""
 	@echo "Creating test code coverage report"
 	@echo " test-cov               - generate code coverage report for test framework"
 	@echo " test-wipe-cov          - wipe code coverage report for test framework"