X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=8084d82266921d97393a1644ca147faee156548f;hb=9d0ca07f1e4f48968724662e804310d9554d94b8;hp=4686c96cb64c0f66a18491c1c715891476d822b9;hpb=2c6efec589add9bb121bfca6ade5e2f9a3fdbaa0;p=vpp.git

diff --git a/Makefile b/Makefile
index 4686c96cb64..8084d822669 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ 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
+DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
+# python3.6 on 16.04 requires python36-dev
+ 
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -91,19 +94,27 @@ RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
 RPM_DEPENDS += yamllint
+RPM_DEPENDS += python3-devel  # needed for python3 -m pip install psutil
 
 ifeq ($(OS_ID),fedora)
 	RPM_DEPENDS += dnf-utils
 	RPM_DEPENDS += subunit subunit-devel
 	RPM_DEPENDS += compat-openssl10-devel
-	RPM_DEPENDS += python3-devel python3-ply
+	RPM_DEPENDS += python3-ply  # for vppapigen
 	RPM_DEPENDS += python3-virtualenv python3-jsonschema
 	RPM_DEPENDS += cmake
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+	RPM_DEPENDS += dnf-utils
+	RPM_DEPENDS += compat-openssl10
+	RPM_DEPENDS += python3-devel python3-ply
+	RPM_DEPENDS += python3-virtualenv python3-jsonschema
+	RPM_DEPENDS += cmake
+	RPM_DEPENDS_GROUPS = 'Development Tools'
 else
 	RPM_DEPENDS += yum-utils
 	RPM_DEPENDS += openssl-devel
-	RPM_DEPENDS += python-devel python36-ply
+	RPM_DEPENDS += python36-ply  # for vppapigen
 	RPM_DEPENDS += python3-devel python3-pip
 	RPM_DEPENDS += python-virtualenv python36-jsonschema
 	RPM_DEPENDS += devtoolset-7
@@ -188,18 +199,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"
@@ -225,13 +225,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"
@@ -309,6 +302,9 @@ ifeq ($(OS_ID),rhel)
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+	@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+	@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
 	@sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@@ -494,6 +490,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
@@ -698,7 +698,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