X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=cca853417b69b336cd0807efa5ecdd839078c1c9;hb=9654a37fac7fe2b425576eb0237b8d24ae44e1b1;hp=7f3c4295e884d8df73eeeab6f7ce649db80a9e8c;hpb=6a3064fdf6883fa09b4325e6f011f0e8acad295e;p=vpp.git diff --git a/Makefile b/Makefile index 7f3c4295e88..cca853417b6 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ SAMPLE_PLUGIN?=no STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) SUDO?=sudo +DPDK_CONFIG?=no-pci ,:=, define disable_plugins @@ -101,7 +102,7 @@ else RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python36-ply - RPM_DEPENDS += python36-devel python36-pip + RPM_DEPENDS += python3-devel python3-pip RPM_DEPENDS += python-virtualenv python36-jsonschema RPM_DEPENDS += devtoolset-7 RPM_DEPENDS += cmake3 @@ -178,54 +179,57 @@ endef help: @echo "Make Targets:" - @echo " install-dep - install software dependencies" - @echo " wipe - wipe all products of debug build " - @echo " wipe-release - wipe all products of release build " - @echo " build - build debug binaries" - @echo " build-release - build release binaries" - @echo " build-coverity - build coverity artifacts" - @echo " rebuild - wipe and build debug binares" - @echo " rebuild-release - wipe and build release binares" - @echo " run - run debug binary" - @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 (all) functional tests" - @echo " test-all-debug - build and run (all) functional 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-help - show help on test framework" - @echo " run-vat - run vpp-api-test tool" - @echo " pkg-deb - build DEB packages" - @echo " pkg-deb-debug - build DEB debug packages" - @echo " vom-pkg-deb - build vom DEB packages" - @echo " vom-pkg-deb-debug - build vom DEB debug packages" - @echo " pkg-rpm - build RPM packages" - @echo " install-ext-deps - install external development dependencies" - @echo " ctags - (re)generate ctags database" - @echo " gtags - (re)generate gtags database" - @echo " cscope - (re)generate cscope database" - @echo " checkstyle - check coding style" - @echo " fixstyle - fix coding style" - @echo " doxygen - (re)generate documentation" - @echo " bootstrap-doxygen - setup Doxygen dependencies" - @echo " wipe-doxygen - wipe all generated documentation" - @echo " checkfeaturelist - check FEATURE.yaml according to schema" - @echo " featurelist - dump feature list in markdown" + @echo " install-dep - install software dependencies" + @echo " wipe - wipe all products of debug build " + @echo " wipe-release - wipe all products of release build " + @echo " build - build debug binaries" + @echo " build-release - build release binaries" + @echo " build-coverity - build coverity artifacts" + @echo " rebuild - wipe and build debug binares" + @echo " rebuild-release - wipe and build release binares" + @echo " run - run debug binary" + @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-help - show help on test framework" + @echo " run-vat - run vpp-api-test tool" + @echo " pkg-deb - build DEB packages" + @echo " pkg-deb-debug - build DEB debug packages" + @echo " vom-pkg-deb - build vom DEB packages" + @echo " vom-pkg-deb-debug - build vom DEB debug packages" + @echo " pkg-rpm - build RPM packages" + @echo " install-ext-deps - install external development dependencies" + @echo " ctags - (re)generate ctags database" + @echo " gtags - (re)generate gtags database" + @echo " cscope - (re)generate cscope database" + @echo " checkstyle - check coding style" + @echo " fixstyle - fix coding style" + @echo " doxygen - (re)generate documentation" + @echo " bootstrap-doxygen - setup Doxygen dependencies" + @echo " wipe-doxygen - wipe all generated documentation" + @echo " checkfeaturelist - check FEATURE.yaml according to schema" + @echo " featurelist - dump feature list in markdown" + @echo " json-api-files - (re)-generate json api files" + @echo " json-api-files-debug - (re)-generate json api files for debug target" @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-checkstyle - check PEP8 compliance for test framework" + @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-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" @@ -420,6 +424,9 @@ test-all-debug: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) +papi-wipe: + @make -C test papi-wipe + test-help: @make -C test help @@ -445,7 +452,7 @@ test-wipe-doc: @make -C test wipe-doc test-cov: - @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install + @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -455,6 +462,9 @@ test-wipe-cov: test-checkstyle: @make -C test checkstyle +test-refresh-deps: + @make -C test refresh-deps + retest: $(call test,vpp,vpp,retest) @@ -530,6 +540,12 @@ dpdk-install-dev: install-ext-deps: make -C build/external install-$(PKG) +json-api-files: + $(WS_ROOT)/src/tools/vppapigen/generate_json.py + +json-api-files-debug: + $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target + ctags: ctags.files @ctags --totals --tag-relative -L $< @rm $< @@ -590,7 +606,7 @@ docs: $(DOCS_DIR) docs-clean: @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean) -verify: install-dep $(BR)/.deps.ok install-ext-deps +pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps $(call banner,"Building for PLATFORM=vpp using gcc") @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages $(call banner,"Building sample-plugin") @@ -601,7 +617,15 @@ verify: install-dep $(BR)/.deps.ok install-ext-deps @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) +ifeq ($(OS_ID),ubuntu) + $(call banner,"Building VOM $(PKG) package") + @make vom-pkg-deb +endif + +verify: pkg-verify ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) + $(call banner,"Testing vppapigen") + @src/tools/vppapigen/test_vppapigen.py $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif