diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-11-13 23:54:43 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-11-13 23:54:43 +0900 |
| commit | 2f7d2662dd90a6985f1c98ea93cfc2026407a8ab (patch) | |
| tree | ac8ef2e95da478604a18b3af51378e2290c4ac44 | |
| parent | 8d82f4ba1c715da6a50b8626792a49c343914efd (diff) | |
| download | ruby-2f7d2662dd90a6985f1c98ea93cfc2026407a8ab.tar.gz | |
Control non-parallel parts with `.WAIT` if available
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | defs/gmake.mk | 4 | ||||
| -rw-r--r-- | template/GNUmakefile.in | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -776,7 +776,7 @@ clean-spec: PHONY -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD) -$(Q) $(RMALL) rubyspec_temp -check: main test test-tool test-all test-spec +check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all $(DOT_WAIT) test-spec $(ECHO) check succeeded -$(Q) : : "run only on sh"; \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ @@ -854,7 +854,7 @@ yes-test-tool: prog PHONY no-test-tool: PHONY test-sample: test-basic # backward compatibility for mswin-build -test-short: btest-ruby test-knownbug test-basic +test-short: btest-ruby $(DOT_WAIT) test-knownbug $(DOT_WAIT) test-basic test: test-short # $ make test-all TESTOPTS="--help" displays more detail 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)) diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index 4fe4aab979..0c8ac5f0e4 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -12,6 +12,10 @@ ifeq ($(HAVE_BASERUBY),yes) override REVISION_FORCE := PHONY endif +ifneq ($(filter notintermediate,$(.FEATURES)),) +DOT_WAIT = .WAIT +endif + include $(srcdir)/defs/universal.mk -include uncommon.mk include $(srcdir)/defs/gmake.mk |