nobu	2015-10-04 21:35:47 +0900 (Sun, 04 Oct 2015)

  New Revision: 52022

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

  Log:
    gmake.mk: test order
    
    * common.mk (test-almost): rename target to test other than
      test-frameworks.
    
    * defs/gmake.mk (test-almost): run after test-testframework.

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 52021)
+++ defs/gmake.mk	(revision 52022)
@@ -46,14 +46,17 @@ 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)),)
-yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
+test-testframework 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))),)
-yes-test-all yes-test-ruby: yes-test-knownbug
+test-testframework test-almost yes-test-ruby: yes-test-knownbug
 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 52021)
+++ common.mk	(revision 52022)
@@ -546,9 +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
-	$(MAKE) test-testframework
-	$(MAKE) test-all TEST_EXCLUDES="$(TEST_EXCLUDES) $(EXCLUDE_TESTFRAMEWORK)"
+check: main test test-all
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
@@ -585,15 +583,14 @@ 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: $(TEST_RUNNABLE)-test-testframework
-no-test-testframework: PHONY
-yes-test-testframework: prog PHONY
+test-testframework: prog PHONY
 	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
 
 test: test-sample btest-ruby test-knownbug
 
 test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog PHONY
+yes-test-all: prog test-testframework test-almost PHONY
+test-almost:
 	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY

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