Commit 43d838f2 authored by Seth Goings's avatar Seth Goings Committed by Michelle Noorali

remove duplicate test target @ root

add structure for [lint,vet,test-unit] all wrapped up
by the test target
parent 1af4b9ae
...@@ -49,5 +49,3 @@ $(TARGETS) : % : $(addsuffix %,$(SUBDIRS)) ...@@ -49,5 +49,3 @@ $(TARGETS) : % : $(addsuffix %,$(SUBDIRS))
$(SUBDIRS_TARGETS) : $(SUBDIRS_TARGETS) :
$(MAKE) -C $(@D) $(@F:.%=%) $(MAKE) -C $(@D) $(@F:.%=%)
test:
go test -v ./...
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
include ../include.mk
.PHONY : all build test push container clean .PHONY : all build test push container clean
DOCKER_REGISTRY := gcr.io DOCKER_REGISTRY := gcr.io
...@@ -47,5 +49,17 @@ clean: ...@@ -47,5 +49,17 @@ clean:
-docker rmi $(PREFIX)/$(IMAGE):$(TAG) -docker rmi $(PREFIX)/$(IMAGE):$(TAG)
rm -f expandybird rm -f expandybird
test: .PHONY: test
go test -v ./... test: lint vet test-unit
.PHONY: test-unit
test-unit:
$(GO_TEST)
.PHONY: lint
lint:
$(GO_LINT)
.PHONY: vet
vet:
$(GO_VET)
GO_VET := echo using go vet
GO_TEST := go test -v ./...
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment