Skip to content

Commit

Permalink
common.mk: make check now includes make test-tool
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mame committed Jul 21, 2019
1 parent 24712ee commit 08ea924
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions common.mk
Expand Up @@ -187,7 +187,6 @@ INSTALL_DATA_MODE = 0644
TESTSDIR = $(srcdir)/test
TOOL_TESTSDIR = $(srcdir)/tool/test
TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
TESTWORKDIR = testwork
TESTOPTS = $(RUBY_TESTOPTS)

Expand Down Expand Up @@ -715,7 +714,7 @@ clean-spec: PHONY
-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
-$(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
check-ruby: test test-ruby

Expand Down Expand Up @@ -759,7 +758,7 @@ no-test-testframework: PHONY

test-tool: $(TEST_RUNNABLE)-test-tool
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

test-sample: test-basic # backward compatibility for mswin-build
Expand Down Expand Up @@ -1496,7 +1495,7 @@ help: PHONY
" runruby: runs test.rb by ruby you just built" \
" gdb: runs test.rb by miniruby 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-all: all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
" test-spec: run the Ruby spec suite [SPECOPTS=<specs, opts>]" \
Expand Down

0 comments on commit 08ea924

Please sign in to comment.