nobu	2015-10-09 22:54:43 +0900 (Fri, 09 Oct 2015)

  New Revision: 52096

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52096

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

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 52095)
+++ defs/gmake.mk	(revision 52096)
@@ -46,17 +46,15 @@ yes-btest-ruby: $(TEST_DEPENDS) yes-test https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L46
 yes-test-sample: $(TEST_DEPENDS)
 endif
 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
 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
 
 $(TEST_TARGETS): $(TEST_DEPENDS)
 
-test-almost: TEST_EXCLUDES += $(EXCLUDE_TESTFRAMEWORK)
-test-almost: test-testframework
-
 ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
 install-targets := $(filter install uninstall,$(MAKECMDGOALS))
 $(word 1,$(install-targets)): $(word 0,$(install-targets))
Index: common.mk
===================================================================
--- common.mk	(revision 52095)
+++ common.mk	(revision 52096)
@@ -546,7 +546,7 @@ clean-platform: https://github.com/ruby/ruby/blob/trunk/common.mk#L546
 	$(Q) $(RM) $(PLATFORM_D)
 	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
 
-check: main test test-all
+check: main test test-testframework test-almost
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
@@ -583,19 +583,25 @@ no-test-knownbug: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L583
 yes-test-knownbug: prog PHONY
 	-$(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
+no-test-testframework: PHONY
 
 test: test-sample btest-ruby test-knownbug
 
 test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog test-testframework test-almost PHONY
-test-almost:
+yes-test-all: prog PHONY
 	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
 	$(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
 no-test-ruby: PHONY
 yes-test-ruby: prog encs PHONY
@@ -1029,7 +1035,7 @@ change: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1035
 
 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
 
 yes-test-all: sudo-precheck

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/