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

ruby-changes:27563

From: nobu <ko1@a...>
Date: Wed, 6 Mar 2013 20:59:32 +0900 (JST)
Subject: [ruby-changes:27563] nobu:r39615 (trunk): defs/gmake.mk: serialize test targets.

nobu	2013-03-06 20:59:23 +0900 (Wed, 06 Mar 2013)

  New Revision: 39615

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

  Log:
    defs/gmake.mk: serialize test targets.

  Added files:
    trunk/defs/gmake.mk
  Modified files:
    trunk/template/GNUmakefile.in

Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 0)
+++ defs/gmake.mk	(revision 39615)
@@ -0,0 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L1
+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)

Property changes on: defs/gmake.mk
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: template/GNUmakefile.in
===================================================================
--- template/GNUmakefile.in	(revision 39614)
+++ template/GNUmakefile.in	(revision 39615)
@@ -2,5 +2,6 @@ https://github.com/ruby/ruby/blob/trunk/template/GNUmakefile.in#L2
 override MFLAGS := $(filter-out -j%,$(MFLAGS))
 include Makefile
 -include uncommon.mk
+include $(srcdir)/defs/gmake.mk
 
 GNUmakefile: $(srcdir)/template/GNUmakefile.in

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

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