From 2f7d2662dd90a6985f1c98ea93cfc2026407a8ab Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 13 Nov 2022 23:54:43 +0900 Subject: Control non-parallel parts with `.WAIT` if available --- defs/gmake.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index ec93bfbeba..6064ae40d8 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -19,6 +19,7 @@ INSTRUBY_ENV += SDKROOT= endif INSTRUBY_ARGS += --gnumake +ifeq ($(DOT_WAIT),) CHECK_TARGETS := great exam love check test check% test% btest% # expand test targets, and those dependents TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) @@ -41,6 +42,7 @@ TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) +endif in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&) @@ -71,6 +73,7 @@ $(foreach arch,$(arch_flags),\ $(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch))))) endif +ifeq ($(DOT_WAIT),) .PHONY: $(addprefix yes-,$(TEST_TARGETS)) ifneq ($(filter-out btest%,$(TEST_TARGETS)),) @@ -88,6 +91,7 @@ prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck $(foreach test,$(ORDERED_TEST_TARGETS), \ $(eval yes-$(value test) no-$(value test): $(value prev_test)); \ $(eval prev_test := $(value test))) +endif ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),) install-targets := $(filter install uninstall,$(MAKECMDGOALS)) -- cgit v1.2.1