From 44c748f571d5b75859b7abc954453c6bd8e10c3d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 26 Oct 2017 00:59:13 +0000 Subject: [PATCH] common.mk: test-bundler [ci skip] * common.mk (test-bundler): moved from Makefile.in so it might work on nmake too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 15 --------------- common.mk | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile.in b/Makefile.in index dbb126b869..8953f6910e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -490,21 +490,6 @@ yes-test-bundled-gems: yes-test-bundled-gems-prepare 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) diff --git a/common.mk b/common.mk index 5ca7af5d13..691f39ee49 100644 --- a/common.mk +++ b/common.mk @@ -1157,6 +1157,21 @@ update-bundled_gems: PHONY "$(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 \