ConfigAPI and Query API improvements

[multicloud/k8s.git] / src / k8splugin / Makefile

diff --git a/src/k8splugin/Makefile b/src/k8splugin/Makefile
index afb83d6..a1cda8d 100644 (file)
--- a/src/k8splugin/Makefile
+++ b/src/k8splugin/Makefile
@@ -7,17 +7,15 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-GOPATH := $(shell realpath "$(PWD)/../../")
-
-export GOPATH ...
 export GO111MODULE=on
+GO ?= go
 
 .PHONY: plugins
 
 
 all: clean plugins
        CGO_ENABLED=1 GOOS=linux GOARCH=amd64
-       @go build -a -tags netgo -o ./k8plugin ./cmd/main.go
+       @$(GO) build -tags netgo -o ./k8plugin ./cmd/main.go
 
 # The following is done this way as each patch on CI runs build and each merge runs deploy. So for build we don't need to build binary and hence
 # no need to create a static binary with additional flags. However, for generating binary, additional build flags are necessary. This if used with
@@ -27,23 +25,15 @@ build: clean plugins test cover
 deploy: build
 
 .PHONY: test
-test: unit integration
-
-.PHONY: unit
-unit:
-       @go test -v -tags 'unit' ./...
-
-.PHONY: integration
-integration: clean
-       @go build -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go
-       @go build -buildmode=plugin -o ./mock_files/mock_plugins/mocknetworkplugin.so ./mock_files/mock_plugins/mocknetworkplugin.go
-       @go test -v -tags 'integration' ./...
+test: clean
+       @$(GO) build -race -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go
+       @$(GO) test -race ./...
 
 format:
-       @go fmt ./...
+       @$(GO) fmt ./...
 
 plugins:
-       @find plugins -maxdepth 1 -type d -not -path plugins -exec sh -c "ls {}/plugin.go | xargs go build -buildmode=plugin -a -tags netgo -o $(basename {}).so" \;
+       @find plugins -maxdepth 1 -type d -not -path plugins -exec sh -c "ls {}/plugin.go | xargs $(GO) build -buildmode=plugin -tags netgo -o $(basename {}).so" \;
 
 clean:
        @find . -name "*so" -delete
@@ -51,5 +41,5 @@ clean:
 
 .PHONY: cover
 cover:
-       @go test -tags 'unit' ./... -coverprofile=coverage.out
-       @go tool cover -html=coverage.out -o coverage.html
+       @$(GO) test -race ./... -coverprofile=coverage.out
+       @$(GO) tool cover -html=coverage.out -o coverage.html