root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Makefile: use a $(GO_TEST) macro, fix a typo 

Use a $GO_TEST macro, which sets GO111MODULE=on like $GO_BUILD does, to
run tests from the Makefile.  Also, fix a typo.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Closes: #2104
Approved by: rhatdan
This commit is contained in:
Nalin Dahyabhai 2020-01-17 10:44:47 -05:00 committed by Atomic Bot
parent b7f737d169
commit 678dfb50a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -18,8 +18,10 @@ GOVERSION := $(findstring $(GO110),$(shell go version))
# test for go module support # test for go module support
ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor
else else
export GO_BUILD=$(GO) build export GO_BUILD=$(GO) build
export GO_TEST=$(GO) test
endif endif
GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed"))
@ -128,10 +130,10 @@ tests/testreport/testreport: tests/testreport/testreport.go
.PHONY: test-unit .PHONY: test-unit
test-unit: tests/testreport/testreport test-unit: tests/testreport/testreport
$(GO) test -v -tags "$(STOAGETAGS) $(SECURITYTAGS)" -race $(shell $(GO) list ./... | grep -v vendor | grep -v tests | grep -v cmd) $(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -race $(shell $(GO) list ./... | grep -v vendor | grep -v tests | grep -v cmd)
tmp=$(shell mktemp -d) ; \ tmp=$(shell mktemp -d) ; \
mkdir -p $$tmp/root $$tmp/runroot; \ mkdir -p $$tmp/root $$tmp/runroot; \
$(GO) test -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" ./cmd/buildah -args -root $$tmp/root -runroot $$tmp/runroot -storage-driver vfs -signature-policy $(shell pwd)/tests/policy.json -registries-conf $(shell pwd)/tests/registries.conf $(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" ./cmd/buildah -args -root $$tmp/root -runroot $$tmp/runroot -storage-driver vfs -signature-policy $(shell pwd)/tests/policy.json -registries-conf $(shell pwd)/tests/registries.conf
vendor-in-container: vendor-in-container:
podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.13 make vendor podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.13 make vendor