X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=d8b347ce659bf9cff4772ed363bf678ea7d0f3fb;hb=dd1e3e780;hp=17a69bab42d90435a794bf7dd0bb7a9b3afaa5e1;hpb=e4a6d69faa6e72650bd2097414457b991bc5ef93;p=vpp.git diff --git a/Makefile b/Makefile index 17a69bab42d..d8b347ce659 100644 --- a/Makefile +++ b/Makefile @@ -93,15 +93,15 @@ ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils RPM_DEPENDS += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel - RPM_DEPENDS += python2-devel python34-ply - RPM_DEPENDS += python2-virtualenv + RPM_DEPENDS += python3-devel python3-ply + RPM_DEPENDS += python3-virtualenv RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python34-ply - RPM_DEPENDS += python34-devel python34-pip + RPM_DEPENDS += python-devel python36-ply + RPM_DEPENDS += python36-devel python36-pip RPM_DEPENDS += python-virtualenv RPM_DEPENDS += devtoolset-7 RPM_DEPENDS += cmake3 @@ -141,7 +141,7 @@ endif ifeq ($(OS_ID),opensuse-leap) ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc + RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif endif @@ -194,6 +194,7 @@ help: @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" @@ -402,6 +403,9 @@ test: test-debug: $(call test,vpp,vpp_debug,test) +test-gcov: + $(call test,vpp,vpp_gcov,test) + test-all: $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,) $(eval EXTENDED_TESTS=yes)