STATS: stat_client updates.

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index c1bc849..55e2b10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,14 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
 SUDO?=sudo
 
+ifeq ($(findstring $(MAKECMDGOALS),verify pkg-deb pkg-rpm test test-debug),)
+export vpp_uses_cmake?=yes
+endif
+
 ,:=,
 define disable_plugins
 $(if $(1), \
@@ -65,6 +70,7 @@ 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 python-dev python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev
+DEB_DEPENDS += cmake ninja-build
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
        DEB_DEPENDS += libssl-dev
@@ -75,7 +81,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
        DEB_DEPENDS += default-jdk-headless
        DEB_DEPENDS += libssl1.0-dev
-else 
+else
        DEB_DEPENDS += default-jdk-headless
        DEB_DEPENDS += libssl-dev
 endif
@@ -115,7 +121,7 @@ RPM_DEPENDS += chrpath libffi-devel rpm-build
 SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
 SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
 RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
-RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply
+RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python-ply
 
 RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel
 RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel
@@ -187,6 +193,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-ext            - build and run 'extras' functional tests"
        @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"
@@ -284,12 +291,15 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
        @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 ($(filter opensuse,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
        @sudo -E zypper refresh
        @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
        @sudo -E zypper refresh
        @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+       @sudo -E zypper refresh
+       @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else
        $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
 endif
@@ -353,7 +363,7 @@ export VPP_PYTHON_PREFIX ?= $(BR)/python
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
 define test
-       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install vom-install,)
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
        $(eval libs:=lib lib64)
        make -C test \
          TEST_DIR=$(WS_ROOT)/test \
@@ -379,6 +389,11 @@ test-all:
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp,test)
 
+test-ext:
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
+       $(eval EXTENDED_TESTS=yes)
+       $(call test,vpp,vpp_debug,test-ext)
+
 test-all-debug:
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,test)
@@ -420,7 +435,6 @@ retest:
 retest-debug:
        $(call test,vpp,vpp_debug,retest)
 
-STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@@ -451,7 +465,7 @@ run-release:
 debug:
        $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
-build-coverity: 
+build-coverity:
        $(call make,$(PLATFORM)_coverity,install-packages)
 
 debug-release:
@@ -527,6 +541,8 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev
        @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
        $(call banner,"Building libmemif")
        @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
+       $(call banner,"Building JAPI")
+       @make -C build-root PLATFORM=vpp TAG=vpp japi-install
        $(call banner,"Building VOM")
        @make -C build-root PLATFORM=vpp TAG=vpp vom-install
        $(call banner,"Building $(PKG) packages")