Added VPP state 'NotResponding'

[govpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f6e2b9c..bd11c26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ endif
 
 GO_BUILD_TAGS ?= novpp
 
-GO_BUILD_ARGS = -ldflags "${LDFLAGS}"
+GO_BUILD_ARGS = -ldflags "$(LDFLAGS)"
 ifneq ($(GO_BUILD_TAGS),)
 GO_BUILD_ARGS += -tags="${GO_BUILD_TAGS}"
 endif
@@ -38,13 +38,7 @@ endif
 VPP_VERSION    = $(shell dpkg-query -f '\${Version}' -W vpp)
 
 VPP_IMG        ?= ligato/vpp-base:latest
-BINAPI_DIR     ?= ./examples/binapi
-
-help:
-       @echo "List of make targets:"
-       grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-.DEFAULT = help
+BINAPI_DIR     ?= ./binapi
 
 bin:
        mkdir -p bin
@@ -64,6 +58,7 @@ clean: ## Clean all
        $(GO) clean -v ./...
 
 test: ## Run unit tests
+       $(GO) version
        @echo "# running tests"
        $(GO) test -tags="${GO_BUILD_TAGS}" ./...
 
@@ -79,7 +74,7 @@ install: install-generator install-proxy ## Install all
 
 install-generator: ## Install binapi-generator
        @echo "# installing binapi-generator ${VERSION}"
-       $(GO) install ${GO_BUILD_ARGS} ./cmd/binapi-generator
+       @$(GO) install ${GO_BUILD_ARGS} ./cmd/binapi-generator
 
 install-proxy: ## Install vpp-proxy
        @echo "# installing vpp-proxy ${VERSION}"
@@ -97,16 +92,21 @@ gen-binapi-docker: install-generator ## Generate binapi code (using Docker)
        @echo "# generating binapi in docker image ${VPP_IMG}"
        $(eval cmds := $(shell go generate -n $(BINAPI_DIR) 2>&1 | tr "\n" ";"))
        docker run -t --rm \
-               -v "$(shell which gofmt):/usr/local/bin/gofmt:ro" \
+               -e DEBUG_GOVPP \
                -v "$(shell which binapi-generator):/usr/local/bin/binapi-generator:ro" \
                -v "$(shell pwd):/govpp" -w /govpp \
                -u "$(shell id -u):$(shell id -g)" \
                "${VPP_IMG}" \
-         sh -xc "cd $(BINAPI_DIR) && $(cmds)"
+         sh -ec "cd $(BINAPI_DIR) && $(cmds)"
 
 extras:
        @make -C extras
 
+help:
+       @echo "List of make targets:"
+       grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.DEFAULT = help
 
 .PHONY: help \
     build cmd examples clean \