1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
hsbt 2015-09-17 08:42:14 +00:00
parent e9edce8ebb
commit 3d86c47356
2 changed files with 12 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Thu Sep 17 17:42:09 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* 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@gmail.com>
* test/ruby/test_dir.rb (TestDir#test_fileno): s/?x/"x"/. Don't

View file

@ -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