diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-06 11:59:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-06 11:59:23 +0000 |
commit | 5c1af05ef521eeb7a718aefbacf9b78a0a48e5df (patch) | |
tree | d456c4cdbfbbe4f0416520e2e51fcddbbd26890d | |
parent | 0af37bf0c5146a827993a4aeb0807387b6b33d1e (diff) |
defs/gmake.mk: serialize test targets.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | defs/gmake.mk | 17 | ||||
-rw-r--r-- | template/GNUmakefile.in | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk new file mode 100644 index 0000000000..67dce0b514 --- /dev/null +++ b/defs/gmake.mk @@ -0,0 +1,17 @@ +TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS)) +TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS))) +TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS))) +TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS))) +TEST_DEPENDS += $(TEST_DEPENDS) $(if $(filter check%,$(MAKECMDGOALS)),main) + +ifneq ($(filter check% test,$(MAKECMDGOALS)),) +yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby +yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample +yes-test-sample: $(TEST_DEPENDS) +endif +ifneq ($(filter check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),) +yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \ + yes-test-knownbug +endif + +$(TEST_TARGETS): $(TEST_DEPENDS) diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index fe6d677f1d..7fcdd71b8b 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -2,5 +2,6 @@ override MFLAGS := $(filter-out -j%,$(MFLAGS)) include Makefile -include uncommon.mk +include $(srcdir)/defs/gmake.mk GNUmakefile: $(srcdir)/template/GNUmakefile.in |