Skip to content

Commit e2c505f

Browse files
authored
Add RACE_ENABLED=1 envs for make test* (#10055)
1 parent 79ce91f commit e2c505f

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

Makefile

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ EXTRA_GOFLAGS ?=
3030

3131
MAKE_VERSION := $(shell $(MAKE) -v | head -n 1)
3232

33+
ifneq ($(RACE_ENABLED),)
34+
GOTESTFLAGS ?= -race
35+
endif
36+
3337
ifneq ($(DRONE_TAG),)
3438
VERSION ?= $(subst v,,$(DRONE_TAG))
3539
GITEA_VERSION ?= $(VERSION)
@@ -219,7 +223,7 @@ fmt-check:
219223

220224
.PHONY: test
221225
test:
222-
GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
226+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
223227

224228
PHONY: test-check
225229
test-check:
@@ -246,7 +250,7 @@ coverage:
246250

247251
.PHONY: unit-test-coverage
248252
unit-test-coverage:
249-
GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
253+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
250254

251255
.PHONY: vendor
252256
vendor:
@@ -371,42 +375,42 @@ integration-test-coverage: integrations.cover.test generate-ini-mysql
371375
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
372376

373377
integrations.mysql.test: git-check $(GO_SOURCES)
374-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
378+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
375379

376380
integrations.mysql8.test: git-check $(GO_SOURCES)
377-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
381+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql8.test
378382

379383
integrations.pgsql.test: git-check $(GO_SOURCES)
380-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
384+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
381385

382386
integrations.mssql.test: git-check $(GO_SOURCES)
383-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
387+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mssql.test
384388

385389
integrations.sqlite.test: git-check $(GO_SOURCES)
386-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
390+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
387391

388392
integrations.cover.test: git-check $(GO_SOURCES)
389-
GO111MODULE=on $(GO) test -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
393+
GO111MODULE=on $(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
390394

391395
.PHONY: migrations.mysql.test
392396
migrations.mysql.test: $(GO_SOURCES)
393-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql.test
397+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql.test
394398

395399
.PHONY: migrations.mysql8.test
396400
migrations.mysql8.test: $(GO_SOURCES)
397-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql8.test
401+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mysql8.test
398402

399403
.PHONY: migrations.pgsql.test
400404
migrations.pgsql.test: $(GO_SOURCES)
401-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.pgsql.test
405+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.pgsql.test
402406

403407
.PHONY: migrations.mssql.test
404408
migrations.mssql.test: $(GO_SOURCES)
405-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.mssql.test
409+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.mssql.test
406410

407411
.PHONY: migrations.sqlite.test
408412
migrations.sqlite.test: $(GO_SOURCES)
409-
$(GO) test -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
413+
$(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/integrations/migration-test -o migrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
410414

411415
.PHONY: check
412416
check: test

0 commit comments

Comments
 (0)