From a6b8922a017ca19ceb82db2b6ac906614e963663 Mon Sep 17 00:00:00 2001 From: Derek Marcotte <554b8425@razorfever.net> Date: Tue, 3 Oct 2017 16:40:22 -0400 Subject: [PATCH] Only enable race detector when GOHOSTARCH is amd64. This enables native builds to still run the test and all targets without problems on say 386. Build failure on Buildkite build 85, prevents enabling native FreeBSD 386 builds. --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b1d6d6b2..4f5ebe0c 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ GO ?= GO15VENDOREXPERIMENT=1 go GOPATH := $(firstword $(subst :, ,$(shell $(GO) env GOPATH))) GOARCH := $(shell $(GO) env GOARCH) +GOHOSTARCH := $(shell $(GO) env GOHOSTARCH) PROMU ?= $(GOPATH)/bin/promu STATICCHECK ?= $(GOPATH)/bin/staticcheck @@ -26,6 +27,11 @@ DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) MACH ?= $(shell uname -m) DOCKERFILE ?= Dockerfile +ifeq ($(GOHOSTARCH),amd64) + # Only supported on amd64 + test-flags := -race +endif + ifeq ($(OS),Windows_NT) OS_detected := Windows else @@ -63,7 +69,7 @@ style: test: collector/fixtures/sys/.unpacked @echo ">> running tests" - @$(GO) test -short -race $(pkgs) + $(GO) test -short $(test-flags) $(pkgs) test-32bit: collector/fixtures/sys/.unpacked @echo ">> running tests in 32-bit mode"