summaryrefslogtreecommitdiff
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
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
-rw-r--r--common.mk11
-rw-r--r--defs/gmake.mk7
2 files changed, 9 insertions, 9 deletions
diff --git a/common.mk b/common.mk
index e730a4e..10d6a7d 100644
--- a/common.mk
+++ b/common.mk
@@ -546,9 +546,7 @@ clean-platform:
$(Q) $(RM) $(PLATFORM_D)
-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
-check: main test
- $(MAKE) test-testframework
- $(MAKE) test-all TEST_EXCLUDES="$(TEST_EXCLUDES) $(EXCLUDE_TESTFRAMEWORK)"
+check: main test test-all
$(ECHO) check succeeded
check-ruby: test test-ruby
@@ -585,15 +583,14 @@ 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: $(TEST_RUNNABLE)-test-testframework
-no-test-testframework: PHONY
-yes-test-testframework: prog PHONY
+test-testframework: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
test: test-sample btest-ruby test-knownbug
test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog PHONY
+yes-test-all: prog test-testframework test-almost PHONY
+test-almost:
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY
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))