summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2019-07-21 22:30:15 +0900
committerYusuke Endoh <mame@ruby-lang.org>2019-07-21 22:30:15 +0900
commit08ea9240437bd866ae1169a91010d7767a22c9c1 (patch)
treed6c9f6ce372916fa0c23ad00034137a9e5f5049e /common.mk
parent24712eeec39f5e9a11cfc2b940358403cda4f2b6 (diff)
common.mk: `make check` now includes `make test-tool`
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.
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index da81afa418..74f77519b4 100644
--- a/common.mk
+++ b/common.mk
@@ -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)
@@ -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
@@ -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
@@ -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>]" \