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

gmake.mk: tests step

Browse Source 
* defs/gmake.mk (TEST_TARGETS): run tests step by step.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-02-13 05:11:14 +00:00
parent 302ae913e0
commit 44e36c79d2
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -671,9 +671,9 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
> rbconfig.tmp > rbconfig.tmp
$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp $(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
test-rubyspec-precheck: test-rubyspec-precheck: $(arch)-fake.rb
test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb test-rubyspec: test-rubyspec-precheck
$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable

44
defs/gmake.mk
View File

@ -4,12 +4,18 @@ override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
mflags := $(filter-out -j%,$(MFLAGS)) mflags := $(filter-out -j%,$(MFLAGS))
CHECK_TARGETS := exam love check% CHECK_TARGETS := exam love check%
TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS)) # expand test targets, and those dependents
TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS))) TEST_TARGETS := $(filter exam check test check% test% btest%,$(MAKECMDGOALS))
TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS))) TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS))
TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS))) TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS))
TEST_DEPENDS += $(if $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)),main) TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_DEPENDS += $(if $(filter main,$(TEST_DEPENDS)),$(if $(filter all,$(INSTALLDOC)),docs)) TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst check,test test-testframework test-almost,$(patsubst check-%,test test-%,$(TEST_TARGETS)))
TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_TARGETS := $(patsubst test,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_DEPENDS += $(if $(filter-out btest%,$(TEST_TARGETS)),all exts)
ifneq ($(filter -O0 -Od,$(optflags)),) ifneq ($(filter -O0 -Od,$(optflags)),)
override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS)) override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
@ -42,21 +48,21 @@ $(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
$(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
ifneq ($(filter $(CHECK_TARGETS) test,$(MAKECMDGOALS)),) .PHONY: $(addprefix yes-,$(TEST_TARGETS))
yes-test-basic: $(TEST_DEPENDS) yes-test-knownbug
yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby ifneq ($(filter-out btest%,$(TEST_TARGETS)),)
yes-btest-ruby: $(TEST_DEPENDS) $(addprefix yes-,$(TEST_TARGETS)): $(TEST_DEPENDS)
endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter yes-test-all,$(TEST_TARGETS)),)
yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \
yes-test-basic
endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
yes-test-almost: yes-test-testframework
endif endif
$(TEST_TARGETS): $(TEST_DEPENDS) ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
btest-ruby test-knownbug test-basic \
test-testframework test-almost test-all \
test-rubyspec \
)
prev_test := $(if $(filter test-rubyspec,$(ORDERED_TEST_TARGETS)),test-rubyspec-precheck)
$(foreach test,$(addprefix yes-,$(ORDERED_TEST_TARGETS)), \
$(eval $(value test): $(value prev_test)); \
$(eval prev_test := $(value test)))
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))