[前][次][番号順一覧][スレッド一覧]

ruby-changes:39925

From: nobu <ko1@a...>
Date: Sat, 3 Oct 2015 23:11:47 +0900 (JST)
Subject: [ruby-changes:39925] nobu:r52006 (trunk): common.mk: separate tests

nobu	2015-10-03 23:11:23 +0900 (Sat, 03 Oct 2015)

  New Revision: 52006

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

  Log:
    common.mk: separate tests
    
    * common.mk (check): separate test-testframework and test-all.

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 52005)
+++ common.mk	(revision 52006)
@@ -147,7 +147,8 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARG https://github.com/ruby/ruby/blob/trunk/common.mk#L147
 			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
 
 TESTSDIR      = $(srcdir)/test
-TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes -x /testunit/ -x /minitest/ -x /memory_leak/
+TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes -x /memory_leak/
+EXCLUDE_TESTFRAMEWORK = -x /testunit/ -x /minitest/
 TESTWORKDIR   = testwork
 TESTOPTS      = $(RUBY_TESTOPTS)
 
@@ -545,7 +546,9 @@ 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
+	$(MAKE) test-testframework
+	$(MAKE) test-all TEST_EXCLUDES="$(TEST_EXCLUDES) $(EXCLUDE_TESTFRAMEWORK)"
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
@@ -589,7 +592,7 @@ yes-test-testframework: prog PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L592
 
 test: test-sample btest-ruby test-knownbug
 
-test-all: test-testframework $(TEST_RUNNABLE)-test-all
+test-all: $(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/

[前][次][番号順一覧][スレッド一覧]