summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-10 08:42:45 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-10 08:42:45 +0000
commit163b830d70dabe629816bf7ecf8e5ad3bd511c3e (patch)
treedec00529a8bdf3071f276d3bc27fb76bd9e31c42
parentdf9521fd043df1fb862e46f9b1af83223f16eb2d (diff)
common.mk: "make check" now runs test-spec
Currently there are many "make" targets for testing: test, test-all, check, exam, etc. To make it simple, this change makes "make check" run all tests. "make exam" is just an alias to "make check". If a new test suite is added in future, "make check" should include it (unless it takes too much time...) [Feature #14187] Also, this introduces "make test-short" as an alias to "make test". I believe "make test" should equal to "make check", but there is objection against this. So now I commit only things that we agreed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/common.mk b/common.mk
index bf3593a..78ad6db 100644
--- a/common.mk
+++ b/common.mk
@@ -683,7 +683,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-almost
+check: main test test-testframework test-almost test-spec
$(ECHO) check succeeded
check-ruby: test test-ruby
@@ -726,7 +726,8 @@ yes-test-testframework: prog PHONY
no-test-testframework: PHONY
test-sample: test-basic # backward compatibility for mswin-build
-test: btest-ruby test-knownbug test-basic
+test-short: btest-ruby test-knownbug test-basic
+test: test-short
# $ make test-all TESTOPTS="--help" displays more detail
# for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
@@ -805,7 +806,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
.PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout
.PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
.PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-.PHONY: check test test-all btest btest-ruby test-basic test-knownbug
+.PHONY: exam check test test-short test-all btest btest-ruby test-basic test-knownbug
.PHONY: run runruby parse benchmark gdb gdb-ruby
.PHONY: update-mspec update-rubyspec test-rubyspec test-spec
.PHONY: touch-unicode-files
@@ -1358,7 +1359,7 @@ info-arch: PHONY
change: PHONY
$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
-exam: check test-spec
+exam: check
love: sudo-precheck up all test exam install
@echo love is all you need