diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-23 04:10:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-23 04:10:41 +0000 |
| commit | ba904c4272df7b95e517b9489e0cbc941bb263d0 (patch) | |
| tree | bc77fa7365e6d39eff40ab72ee96d73ef75062c4 /defs | |
| parent | 7c26c6fe712e5cacd888019652ebc76f35773121 (diff) | |
| download | ruby-ba904c4272df7b95e517b9489e0cbc941bb263d0.tar.gz | |
fix circular dependencies
* defs/gmake.mk (TEST_DEPENDS): remove targets expanded as
TEST_TARGETS, to get rid of circular dependencies.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index f79db53d14..809489115f 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -8,13 +8,13 @@ CHECK_TARGETS := exam love check% TEST_TARGETS := $(filter exam check test check% test% btest%,$(MAKECMDGOALS)) TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS)) TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS)) -TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS)) -TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst check,test test-testframework test-almost,$(patsubst check-%,test test-%,$(TEST_TARGETS))) -TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS := $(filter-out check $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst test,btest-ruby test-knownbug test-basic,$(TEST_TARGETS)) -TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter-out btest%,$(TEST_TARGETS)),all exts) ifneq ($(filter -O0 -Od,$(optflags)),) |