kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

common.mk: separate test-testframework

Browse source 
* common.mk (check): separate test-testframework from test-all
  only when building check.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-09 13:54:43 +00:00
parent 3e70f44ae9
commit 24e5e37410
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common.mk
View file

@ -546,7 +546,7 @@ clean-platform:
$(Q) $(RM) $(PLATFORM_D) $(Q) $(RM) $(PLATFORM_D)
-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0 -$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
check: main test test-all check: main test test-testframework test-almost
$(ECHO) check succeeded $(ECHO) check succeeded
check-ruby: test test-ruby check-ruby: test test-ruby
@ -583,19 +583,25 @@ no-test-knownbug: PHONY
yes-test-knownbug: prog PHONY yes-test-knownbug: prog PHONY
-$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb -$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb
test-testframework: prog PHONY test-testframework: $(TEST_RUNNABLE)-test-testframework
yes-test-testframework: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
no-test-testframework: PHONY
test: test-sample btest-ruby test-knownbug test: test-sample btest-ruby test-knownbug
test-all: $(TEST_RUNNABLE)-test-all test-all: $(TEST_RUNNABLE)-test-all
yes-test-all: prog test-testframework test-almost PHONY yes-test-all: prog PHONY
test-almost:
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS) $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf TESTS_BUILD = mkmf
no-test-all: PHONY no-test-all: PHONY
$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD) $(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
test-almost: $(TEST_RUNNABLE)-test-almost
yes-test-almost: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
no-test-almost: PHONY
test-ruby: $(TEST_RUNNABLE)-test-ruby test-ruby: $(TEST_RUNNABLE)-test-ruby
no-test-ruby: PHONY no-test-ruby: PHONY
yes-test-ruby: prog encs PHONY yes-test-ruby: prog encs PHONY
@ -1029,7 +1035,7 @@ change: PHONY
exam: check test-rubyspec exam: check test-rubyspec
love: sudo-precheck up all test install test-all love: sudo-precheck up all test install check
@echo love is all you need @echo love is all you need
yes-test-all: sudo-precheck yes-test-all: sudo-precheck

8
defs/gmake.mk
View file

@ -46,17 +46,15 @@ yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
yes-test-sample: $(TEST_DEPENDS) yes-test-sample: $(TEST_DEPENDS)
endif endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),) ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
test-testframework test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
endif endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),) ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
test-testframework test-almost yes-test-ruby: yes-test-knownbug yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
yes-test-almost: yes-test-testframework
endif endif
$(TEST_TARGETS): $(TEST_DEPENDS) $(TEST_TARGETS): $(TEST_DEPENDS)
test-almost: TEST_EXCLUDES += $(EXCLUDE_TESTFRAMEWORK)
test-almost: test-testframework
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))
$(word 1,$(install-targets)): $(word 0,$(install-targets)) $(word 1,$(install-targets)): $(word 0,$(install-targets))