Python API: Missing locking of results data structure.

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 7c3dded..f1813a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-WS_ROOT=$(CURDIR)
-BR=$(WS_ROOT)/build-root
+export WS_ROOT=$(CURDIR)
+export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
@@ -32,8 +32,8 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config doxygen graphviz
-DEB_DEPENDS += python-dev python-virtualenv python-pip python-pyparsing python-jinja2 lcov chrpath autoconf
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -41,9 +41,9 @@ else
 endif
 
 RPM_DEPENDS_GROUPS = 'Development Tools'
-RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils doxygen graphviz
+RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv pyparsing python-jinja2 lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -96,6 +96,7 @@ help:
        @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 ""
        @echo "Make Arguments:"
        @echo " V=[0|1]             - set build verbosity level"
@@ -183,35 +184,6 @@ distversion:       $(BR)/scripts/.version
        $(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
        mv $(verstring).tar.gz $(BR)/rpm
 
-deb-depends-check:
-ifeq ($(OS_ID),ubuntu)
-       @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
-       if [ -n "$$MISSING" ] ; then \
-         echo "\nPlease install missing packages: \n$$MISSING\n" ; \
-         echo "by executing \"make install-dep\"\n" ; \
-       exit 1 ; \
-       fi; \
-       exit 0
-endif
-
-rpm-depends-check:
-ifeq ($(OS_ID),centos)
-       @RPM_DEPENDS_ARRAY=($(RPM_DEPENDS)) ; \
-       for i in "$${!RPM_DEPENDS_ARRAY[@]}"; do \
-         if ! yum list installed "$${RPM_DEPENDS_ARRAY[$$i]}" >/dev/null 2>&1; then \
-           if ! [[ "$${RPM_DEPENDS_ARRAY[$$i]}" == *"://"* ]] ; then \
-             MISSING="$$MISSING $${RPM_DEPENDS_ARRAY[$$i]}" ; \
-           fi; \
-         fi; \
-       done; \
-       if [ -n "$$MISSING" ] ; then \
-         echo "\nPlease install missing packages: \n$$MISSING\n" ; \
-         echo "by executing \"make install-dep\"\n" ; \
-         exit 1 ; \
-       fi; \
-       exit 0
-endif
-
 build: $(BR)/.bootstrap.ok
        $(call make,$(PLATFORM)_debug,vpp-install)
 
@@ -231,18 +203,17 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
-VPP_PYTHON_PREFIX=$(BR)/python
+export VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
        make -C test \
-         BR=$(BR) \
          VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
          VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
          VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
          LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
-         WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
+         $(3)
 endef
 
 test: bootstrap
@@ -258,16 +229,19 @@ test-wipe:
        @make -C test wipe
 
 test-doc:
-       @make -C test WS_ROOT=$(WS_ROOT) BR=$(BR) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) doc
+       @make -C test doc
 
 test-wipe-doc:
-       @make -C test wipe-doc BR=$(BR)
+       @make -C test wipe-doc
 
 test-cov: bootstrap
        $(call test,vpp_lite,vpp_lite_gcov,cov)
 
 test-wipe-cov:
-       @make -C test wipe-cov BR=$(BR)
+       @make -C test wipe-cov
+
+test-checkstyle:
+       @make -C test checkstyle
 
 retest:
        $(call test,vpp_lite,vpp_lite,retest)
@@ -315,10 +289,10 @@ build-vat:
 run-vat:
        @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
-pkg-deb: deb-depends-check doxygen-siphon-list
+pkg-deb:
        $(call make,$(PLATFORM),install-deb)
 
-pkg-rpm: dist rpm-depends-check doxygen-siphon-list
+pkg-rpm: dist
        $(call make,$(PLATFORM),install-rpm)
 
 ctags: ctags.files
@@ -345,12 +319,12 @@ fixstyle:
 export DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 define make-doxy
-       @OS_ID="$(OS_ID)" WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
+       @OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@
 endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen
 
-bootstrap-doxygen: deb-depends-check rpm-depends-check
+bootstrap-doxygen:
        $(call make-doxy)
 
 doxygen:
@@ -359,9 +333,6 @@ doxygen:
 wipe-doxygen:
        $(call make-doxy)
 
-doxygen-siphon-list:
-       $(call make-doxy)
-
 define banner
        @echo "========================================================================"
        @echo " $(1)"
@@ -389,5 +360,6 @@ ifeq ($(OS_ID),centos)
        $(call banner,"Building rpm packages")
        @make pkg-rpm
 endif
+       @make test