Skip to content

Commit

Permalink
race detector for alpine is broken. disable it for now
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelshobbs committed Apr 12, 2017
1 parent a616235 commit 5276f4e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ ifeq ($(shell uname), Darwin)
endif
GOLINT := go list ./... | egrep -v '/custom/|/vendor/' | xargs $(XARGS_ARG) golint | egrep -v 'extpoints.go|types.go'
TEST_MODULES ?= $(shell go list ./... | egrep -v '/vendor|/custom')
TEST_ARGS ?= -race

ifdef TEST_RUN
TESTRUN := -run ${TEST_RUN}
endif
Expand Down Expand Up @@ -42,10 +44,11 @@ test: build-dev
docker run \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(PWD):/go/src/github.com/gliderlabs/logspout \
-e TEST_ARGS="" \
$(NAME):dev make -e test-direct

test-direct:
go test -p 1 -v -race $(TEST_MODULES) $(TESTRUN)
go test -p 1 -v $(TEST_ARGS) $(TEST_MODULES) $(TESTRUN)

test-image-size:
@if [ $(shell docker inspect -f '{{ .Size }}' $(NAME):$(VERSION)) -gt $(MAX_IMAGE_SIZE) ]; then \
Expand Down

0 comments on commit 5276f4e

Please sign in to comment.