From cc8d4cb89e37cd26964a642a7fdcfbf7c0cbcd11 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Tue, 27 Feb 2024 19:23:09 +0100 Subject: makefile: race test split If the test require dev_appserver.py, run it separately. --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 06795f9ee..58994a950 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ endif check_copyright check_language check_whitespace check_links check_diff check_commits check_shebang \ presubmit presubmit_aux presubmit_build presubmit_arch_linux presubmit_arch_freebsd \ presubmit_arch_netbsd presubmit_arch_openbsd presubmit_arch_darwin presubmit_arch_windows \ - presubmit_arch_executor presubmit_dashboard presubmit_race presubmit_old + presubmit_arch_executor presubmit_dashboard presubmit_race presubmit_race_dashboard presubmit_old all: host target host: manager runtest repro mutate prog2c db upgrade @@ -308,6 +308,7 @@ presubmit: $(MAKE) presubmit_arch_windows $(MAKE) presubmit_arch_executor $(MAKE) presubmit_race + $(MAKE) presubmit_race_dashboard presubmit_aux: $(MAKE) generate @@ -372,7 +373,13 @@ presubmit_dashboard: descriptions presubmit_race: descriptions # -race requires cgo env CGO_ENABLED=1 $(GO) test -race; if test $$? -ne 2; then \ - env CGO_ENABLED=1 $(GO) test -race -short -vet=off -bench=.* -benchtime=.2s ./... ;\ + env CGO_ENABLED=1 SYZ_SKIP_DASHBOARD=1 $(GO) test -race -short -vet=off -bench=.* -benchtime=.2s ./... ;\ + fi + +presubmit_race_dashboard: descriptions + # -race requires cgo + env CGO_ENABLED=1 $(GO) test -race; if test $$? -ne 2; then \ + env CGO_ENABLED=1 $(GO) test -race -short -vet=off -bench=.* -benchtime=.2s ./dashboard/app/... ;\ fi presubmit_old: descriptions -- cgit mrf-deployment