ruby-changes:45622
From: nobu <ko1@a...>
Date: Thu, 23 Feb 2017 13:10:46 +0900 (JST)
Subject: [ruby-changes:45622] nobu:r57695 (trunk): fix circular dependencies
nobu 2017-02-23 13:10:41 +0900 (Thu, 23 Feb 2017) New Revision: 57695 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57695 Log: fix circular dependencies * defs/gmake.mk (TEST_DEPENDS): remove targets expanded as TEST_TARGETS, to get rid of circular dependencies. Modified files: trunk/defs/gmake.mk Index: defs/gmake.mk =================================================================== --- defs/gmake.mk (revision 57694) +++ defs/gmake.mk (revision 57695) @@ -8,13 +8,13 @@ CHECK_TARGETS := exam love check% https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L8 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)),) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/