session/dlmalloc: coverity fixes

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index c1bc849..298046d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
 SUDO?=sudo
 
@@ -75,7 +76,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
@@ -187,6 +188,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"
@@ -353,7 +355,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 +381,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,)
+       $(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 +427,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 +457,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: