summaryrefslogtreecommitdiff
path: root/defs/gmake.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 12:35:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 12:35:47 +0000
commit53672aa9a6e543be871f256806afd9b9ad81636b (patch)
treeba915efb11c6beca032dc0a5eb7711f2e1023881 /defs/gmake.mk
parent95d80760818e23316f7789fdaa0caa2d61eb6227 (diff)
gmake.mk: test order
* common.mk (test-almost): rename target to test other than test-frameworks. * defs/gmake.mk (test-almost): run after test-testframework. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs/gmake.mk')
-rw-r--r--defs/gmake.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 1dca911..fb98f85 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -46,14 +46,17 @@ yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
yes-test-sample: $(TEST_DEPENDS)
endif
ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
-yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
+test-testframework 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))),)
-yes-test-all yes-test-ruby: yes-test-knownbug
+test-testframework test-almost yes-test-ruby: yes-test-knownbug
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))