[前][次][番号順一覧][スレッド一覧]

ruby-changes:38066

From: nobu <ko1@a...>
Date: Wed, 1 Apr 2015 17:14:48 +0900 (JST)
Subject: [ruby-changes:38066] nobu:r50147 (trunk): gmake.mk: CHECK_TARGETS

nobu	2015-04-01 17:14:35 +0900 (Wed, 01 Apr 2015)

  New Revision: 50147

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50147

  Log:
    gmake.mk: CHECK_TARGETS
    
    * defs/gmake.mk (CHECK_TARGETS): goals depending on test and
      test-all.

  Modified files:
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 50146)
+++ defs/gmake.mk	(revision 50147)
@@ -5,8 +5,9 @@ TEST_TARGETS := $(filter check test chec https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L5
 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)
+TEST_DEPENDS += $(if $(filter check%,$(MAKECMDGOALS)),main)
 TEST_DEPENDS += $(if $(filter all,$(INSTALLDOC)),docs)
+CHECK_TARGETS := love check%
 
 ifneq ($(filter -O0 -Od,$(optflags)),)
 override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
@@ -39,15 +40,15 @@ $(foreach arch,$(filter -arch=%,$(subst https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L40
 	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
 endif
 
-ifneq ($(filter love check% test,$(MAKECMDGOALS)),)
+ifneq ($(filter $(CHECK_TARGETS) 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 love check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
+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))
 endif
-ifneq ($(filter love check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
+ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
 yes-test-all yes-test-ruby: yes-test-knownbug
 endif
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]