summaryrefslogtreecommitdiff
path: root/defs
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
commit24e5e374107bfa02bd9dda971067cb34473e265e (patch)
treea7e1067eff0c909a34d19b4660ab0a194228aeb7 /defs
parent3e70f44ae9ab258b36df248e0f42539530fd8d72 (diff)
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 'defs')
-rw-r--r--defs/gmake.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index fb98f85..50b1ac5 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -46,17 +46,15 @@ yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
yes-test-sample: $(TEST_DEPENDS)
endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
-test-testframework test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
+yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
-test-testframework test-almost yes-test-ruby: yes-test-knownbug
+yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
+yes-test-almost: yes-test-testframework
endif
$(TEST_TARGETS): $(TEST_DEPENDS)
-test-almost: TEST_EXCLUDES += $(EXCLUDE_TESTFRAMEWORK)
-test-almost: test-testframework
-
ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
install-targets := $(filter install uninstall,$(MAKECMDGOALS))
$(word 1,$(install-targets)): $(word 0,$(install-targets))