From 9e49b57f2620a3b1e8c240797980ff3d9e94ba91 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 Aug 2018 11:55:19 +0000 Subject: fixup r64270 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- defs/gmake.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index 86733bceea..8af2106d86 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -10,15 +10,18 @@ TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS)) TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS)) -TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst check,test-spec test-all,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS)) -TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS)) 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 check $(TEST_TARGETS),$(TEST_DEPENDS)) -TEST_TARGETS := $(patsubst test,btest-ruby test-knownbug test-basic,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst test-all,test test-testframework test-almost,$(patsubst check-%,test test-%,$(TEST_TARGETS))) +TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) ifneq ($(filter -O0 -Od,$(optflags)),) -- cgit v1.2.3