aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-09 13:54:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-09 13:54:43 +0000
commit004aee579b4298d7d7b72fa18d908a94a7125a03 (patch)
treea7e1067eff0c909a34d19b4660ab0a194228aeb7 /common.mk
parentd3d6ea7bdc7595619bbf6a9d9b73a8506322d31a (diff)
downloadruby-004aee579b4298d7d7b72fa18d908a94a7125a03.tar.gz
common.mk: separate test-testframework
* common.mk (check): separate test-testframework from test-all only when building check. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk16
1 files changed, 11 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index 10d6a7d2e6..ba587c0239 100644
--- a/common.mk
+++ b/common.mk
@@ -546,7 +546,7 @@ clean-platform:
$(Q) $(RM) $(PLATFORM_D)
-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
-check: main test test-all
+check: main test test-testframework test-almost
$(ECHO) check succeeded
check-ruby: test test-ruby
@@ -583,19 +583,25 @@ 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: prog PHONY
+test-testframework: $(TEST_RUNNABLE)-test-testframework
+yes-test-testframework: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
+no-test-testframework: PHONY
test: test-sample btest-ruby test-knownbug
test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog test-testframework test-almost PHONY
-test-almost:
+yes-test-all: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY
$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+test-almost: $(TEST_RUNNABLE)-test-almost
+yes-test-almost: prog PHONY
+ $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
+no-test-almost: PHONY
+
test-ruby: $(TEST_RUNNABLE)-test-ruby
no-test-ruby: PHONY
yes-test-ruby: prog encs PHONY
@@ -1029,7 +1035,7 @@ change: PHONY
exam: check test-rubyspec
-love: sudo-precheck up all test install test-all
+love: sudo-precheck up all test install check
@echo love is all you need
yes-test-all: sudo-precheck