From c1ff59c1cd51da6fcc47d31ca84932e9bccced92 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 2 Jun 2021 17:34:11 +0200 Subject: [PATCH] use "true" for RACE_ENABLED (#15261) --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6304508fb1..1fd4216dac 100644 --- a/Makefile +++ b/Makefile @@ -64,8 +64,9 @@ EXTRA_GOFLAGS ?= MAKE_VERSION := $(shell $(MAKE) -v | head -n 1) MAKE_EVIDENCE_DIR := .make_evidence -ifneq ($(RACE_ENABLED),) - GOTESTFLAGS ?= -race +ifeq ($(RACE_ENABLED),true) + GOFLAGS += -race + GOTESTFLAGS += -race endif STORED_VERSION_FILE := VERSION @@ -380,7 +381,7 @@ test-check: .PHONY: test\#% test\#%: @echo "Running go test with -tags '$(TEST_TAGS)'..." - @$(GO) test -mod=vendor -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES) + @$(GO) test -mod=vendor $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_PACKAGES) .PHONY: coverage coverage: