diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-04 12:35:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-04 12:35:47 +0000 |
| commit | 53672aa9a6e543be871f256806afd9b9ad81636b (patch) | |
| tree | ba915efb11c6beca032dc0a5eb7711f2e1023881 /defs | |
| parent | 95d80760818e23316f7789fdaa0caa2d61eb6227 (diff) | |
| download | ruby-53672aa9a6e543be871f256806afd9b9ad81636b.tar.gz | |
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')
| -rw-r--r-- | defs/gmake.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 1dca91184a..fb98f85b19 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)) |