X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=f69a688e88177b13d58494ba7e394e4c98bb1b74;hb=f0d8d8fca943a4fec10e99ee74928e41a937e584;hp=dc7583eb2a1316996c52719b09cafef9ae5646ef;hpb=e7906906079ca2d67bf67cfa9939523213230b56;p=vpp.git diff --git a/Makefile b/Makefile index dc7583eb2a1..f69a688e881 100644 --- a/Makefile +++ b/Makefile @@ -65,12 +65,18 @@ DEB_DEPENDS = curl build-essential autoconf automake ccache DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev -DEB_DEPENDS += python-all python3-all python3-setuptools python-dev +DEB_DEPENDS += python-all python3-all python3-setuptools 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 -ifeq ($(OS_VERSION_ID),14.04) - DEB_DEPENDS += libssl-dev +DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml +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),16.04) + DEB_DEPENDS += python-dev +else ifeq ($(OS_VERSION_ID),18.04) + DEB_DEPENDS += python-dev else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += libssl-dev APT_ARGS = -t jessie-backports @@ -89,20 +95,27 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel RPM_DEPENDS += mbedtls-devel -RPM_DEPENDS += yamllint 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-devel # needed for python3 -m pip install psutil + 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 += yum-utils + RPM_DEPENDS += compat-openssl10 + RPM_DEPENDS += python36-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 @@ -187,18 +200,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 +226,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" @@ -308,6 +303,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) @@ -401,6 +399,7 @@ rebuild-release: wipe-release build-release libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) export TEST_DIR ?= $(WS_ROOT)/test +export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())') define test $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) @@ -415,6 +414,7 @@ define test EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ + RND_SEED=$(RND_SEED) \ CACHE_OUTPUT=$(CACHE_OUTPUT) \ $(3) endef @@ -493,6 +493,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 @@ -626,9 +630,8 @@ cscope: cscope.files @cscope -b -q -v .PHONY: checkstyle -checkstyle: +checkstyle: checkfeaturelist @build-root/scripts/checkstyle.sh - yamllint $(WS_ROOT)/src .PHONY: checkstyle-commit checkstyle-commit: @@ -662,7 +665,7 @@ featurelist: centos-pyyaml .PHONY: checkfeaturelist checkfeaturelist: centos-pyyaml - @build-root/scripts/fts.py --validate --git-status + @build-root/scripts/fts.py --validate --all # # Build the documentation @@ -680,7 +683,7 @@ bootstrap-doxygen: $(call make-doxy) .PHONY: doxygen -doxygen: +doxygen: bootstrap-doxygen $(call make-doxy) .PHONY: wipe-doxygen @@ -702,7 +705,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