1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common.mk: make check now includes make test-tool

Browse Source 
And `make test-tool` includes `make test-testframework`.

This change may be arguable because I'm unsure who is an intended user
of `make check`: a normal user, or Ruby-core developer.  Normal users
don't have to run `make test-tool` for testing their installation, but
Ruby committers should run it before they commit anything.

In this case, I'd be conservative; `make check` includes `test-tool`.
If normal users often report a failure of `make test-tool`, then we can
consider to split `make check` for two sets of target users.
This commit is contained in:
Yusuke Endoh 2019-07-21 22:30:15 +09:00
parent 24712eeec3
commit 08ea924043
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.mk
View File

@ -187,7 +187,6 @@ INSTALL_DATA_MODE = 0644
TESTSDIR = $(srcdir)/test TESTSDIR = $(srcdir)/test
TOOL_TESTSDIR = $(srcdir)/tool/test TOOL_TESTSDIR = $(srcdir)/tool/test
TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/ TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
TESTWORKDIR = testwork TESTWORKDIR = testwork
TESTOPTS = $(RUBY_TESTOPTS) TESTOPTS = $(RUBY_TESTOPTS)
@ -715,7 +714,7 @@ clean-spec: PHONY
-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT) -$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || exit 0 -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || exit 0
check: main test test-testframework test-all test-spec check: main test test-tool test-all test-spec
$(ECHO) check succeeded $(ECHO) check succeeded
check-ruby: test test-ruby check-ruby: test test-ruby
@ -759,7 +758,7 @@ no-test-testframework: PHONY
test-tool: $(TEST_RUNNABLE)-test-tool test-tool: $(TEST_RUNNABLE)-test-tool
yes-test-tool: prog PHONY yes-test-tool: prog PHONY
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --test-target-dir="$(TOOL_TESTSDIR)" -- --ruby="$(RUNRUBY)" $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --test-target-dir="$(TOOL_TESTSDIR)" -- --ruby="$(RUNRUBY)" $(TESTOPTS)
no-test-tool: PHONY no-test-tool: PHONY
test-sample: test-basic # backward compatibility for mswin-build test-sample: test-basic # backward compatibility for mswin-build
@ -1496,7 +1495,7 @@ help: PHONY
" runruby: runs test.rb by ruby you just built" \ " runruby: runs test.rb by ruby you just built" \
" gdb: runs test.rb by miniruby under gdb" \ " gdb: runs test.rb by miniruby under gdb" \
" gdb-ruby: runs test.rb by ruby under gdb" \ " gdb-ruby: runs test.rb by ruby under gdb" \
" check: equals make test test-all test-spec" \ " check: equals make test test-tool test-all test-spec" \
" test: ruby core tests" \ " test: ruby core tests" \
" test-all: all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \ " test-all: all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
" test-spec: run the Ruby spec suite [SPECOPTS=<specs, opts>]" \ " test-spec: run the Ruby spec suite [SPECOPTS=<specs, opts>]" \