hsbt	2015-09-17 17:42:14 +0900 (Thu, 17 Sep 2015)

  New Revision: 51888

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

  Log:
    * common.mk: separated test for test-framework from test-all task.
      They should be invoke at first before tests of test-all.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51887)
+++ ChangeLog	(revision 51888)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Sep 17 17:42:09 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* common.mk: separated test for test-framework from test-all task.
+	  They should be invoke at first before tests of test-all.
+
 Thu Sep 17 12:05:54 2015  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/ruby/test_dir.rb (TestDir#test_fileno): s/?x/"x"/. Don't
Index: common.mk
===================================================================
--- common.mk	(revision 51887)
+++ common.mk	(revision 51888)
@@ -143,7 +143,7 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARG https://github.com/ruby/ruby/blob/trunk/common.mk#L143
 			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
 
 TESTSDIR      = $(srcdir)/test
-TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes -x /memory_leak/
+TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes -x /testunit/ -x /minitest/ -x /memory_leak/
 TESTWORKDIR   = testwork
 TESTOPTS      = $(RUBY_TESTOPTS)
 
@@ -578,9 +578,14 @@ no-test-knownbug: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L578
 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
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) test/testunit test/minitest
+
 test: test-sample btest-ruby test-knownbug
 
-test-all: $(TEST_RUNNABLE)-test-all
+test-all: test-testframework $(TEST_RUNNABLE)-test-all
 yes-test-all: prog PHONY
 	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf

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