summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-03 14:11:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-03 14:11:23 +0000
commit0d324c848ff82d7c8a360c9845248439ef559064 (patch)
tree6e8858d1261c7ccf9a8ff3fc9a6c65adc2600cfc /common.mk
parente54808bb2fae5950558a39a17a47514a5b153ff0 (diff)
common.mk: separate tests
* common.mk (check): separate test-testframework and test-all. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 4679bccced..e730a4e3f2 100644
--- a/common.mk
+++ b/common.mk
@@ -147,7 +147,8 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
$(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:
$(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
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