1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Control non-parallel parts with .WAIT if available

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-11-13 23:54:43 +09:00
parent 8d82f4ba1c
commit 2f7d2662dd
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -776,7 +776,7 @@ clean-spec: PHONY
-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD) -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
-$(Q) $(RMALL) rubyspec_temp -$(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 $(ECHO) check succeeded
-$(Q) : : "run only on sh"; \ -$(Q) : : "run only on sh"; \
if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
@ -854,7 +854,7 @@ yes-test-tool: prog PHONY
no-test-tool: PHONY no-test-tool: PHONY
test-sample: test-basic # backward compatibility for mswin-build 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 test: test-short
# $ make test-all TESTOPTS="--help" displays more detail # $ make test-all TESTOPTS="--help" displays more detail

4
defs/gmake.mk
View File

@ -19,6 +19,7 @@ INSTRUBY_ENV += SDKROOT=
endif endif
INSTRUBY_ARGS += --gnumake INSTRUBY_ARGS += --gnumake
ifeq ($(DOT_WAIT),)
CHECK_TARGETS := great exam love check test check% test% btest% CHECK_TARGETS := great exam love check test check% test% btest%
# expand test targets, and those dependents # expand test targets, and those dependents
TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) 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_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 := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
endif
in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&) 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))))) $(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
endif endif
ifeq ($(DOT_WAIT),)
.PHONY: $(addprefix yes-,$(TEST_TARGETS)) .PHONY: $(addprefix yes-,$(TEST_TARGETS))
ifneq ($(filter-out btest%,$(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), \ $(foreach test,$(ORDERED_TEST_TARGETS), \
$(eval yes-$(value test) no-$(value test): $(value prev_test)); \ $(eval yes-$(value test) no-$(value test): $(value prev_test)); \
$(eval prev_test := $(value test))) $(eval prev_test := $(value test)))
endif
ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),) ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
install-targets := $(filter install uninstall,$(MAKECMDGOALS)) install-targets := $(filter install uninstall,$(MAKECMDGOALS))

4
template/GNUmakefile.in
View File

@ -12,6 +12,10 @@ ifeq ($(HAVE_BASERUBY),yes)
override REVISION_FORCE := PHONY override REVISION_FORCE := PHONY
endif endif
ifneq ($(filter notintermediate,$(.FEATURES)),)
DOT_WAIT = .WAIT
endif
include $(srcdir)/defs/universal.mk include $(srcdir)/defs/universal.mk
-include uncommon.mk -include uncommon.mk
include $(srcdir)/defs/gmake.mk include $(srcdir)/defs/gmake.mk