summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-17 08:42:14 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-17 08:42:14 +0000
commit3d86c4735676ece0fb20b9a60ee61db7e4869a3d (patch)
tree7cc37ff9c29dcb697aaa4105e93a614bac46ee9e /common.mk
parente9edce8ebbf9639c5a0e68a9472eda9da2c2a6b7 (diff)
* common.mk: separated test for test-framework from test-all task.
They should be invoke at first before tests of test-all. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 3e5b219e34..07474e6196 100644
--- a/common.mk
+++ b/common.mk
@@ -143,7 +143,7 @@ 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 /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
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