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

ruby-changes:48320

From: nobu <ko1@a...>
Date: Thu, 26 Oct 2017 09:59:20 +0900 (JST)
Subject: [ruby-changes:48320] nobu:r60434 (trunk): common.mk: test-bundler [ci skip]

nobu	2017-10-26 09:59:13 +0900 (Thu, 26 Oct 2017)

  New Revision: 60434

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

  Log:
    common.mk: test-bundler [ci skip]
    
    * common.mk (test-bundler): moved from Makefile.in so it might
      work on nmake too.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 60433)
+++ Makefile.in	(revision 60434)
@@ -490,21 +490,6 @@ yes-test-bundled-gems: yes-test-bundled- https://github.com/ruby/ruby/blob/trunk/Makefile.in#L490
 	done
 no-test-bundled-gems:
 
-test-bundler-precheck: $(arch)-fake.rb programs
-
-yes-test-bundler-prepare: test-bundler-precheck
-	$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
-		--install-dir .bundle --conservative 'rspec:~> 3.5'
-
-RSPECOPTS = --format progress
-BUNDLER_SPECS =
-test-bundler: $(TEST_RUNNABLE)-test-bundler
-yes-test-bundler: yes-test-bundler-prepare
-	$(gnumake_recursive)$(Q) \
-	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
-		$(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
-no-test-bundler:
-
 update-src::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
Index: common.mk
===================================================================
--- common.mk	(revision 60433)
+++ common.mk	(revision 60434)
@@ -1157,6 +1157,21 @@ update-bundled_gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1157
 	     "$(srcdir)/gems/bundled_gems" | \
 	"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
 
+test-bundler-precheck: $(arch)-fake.rb programs
+
+yes-test-bundler-prepare: test-bundler-precheck
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
+		--install-dir .bundle --conservative 'rspec:~> 3.5'
+
+RSPECOPTS = --format progress
+BUNDLER_SPECS =
+test-bundler: $(TEST_RUNNABLE)-test-bundler
+yes-test-bundler: yes-test-bundler-prepare
+	$(gnumake_recursive)$(Q) \
+	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+		$(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler:
+
 UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
 		$(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \

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

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