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

ruby-changes:48155

From: hsbt <ko1@a...>
Date: Sat, 21 Oct 2017 22:17:58 +0900 (JST)
Subject: [ruby-changes:48155] hsbt:r60269 (trunk): Rename spec/rspec to .bundle.

hsbt	2017-10-21 22:17:54 +0900 (Sat, 21 Oct 2017)

  New Revision: 60269

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

  Log:
    Rename spec/rspec to .bundle.
    
      It used without rspec installation for test-* task.

  Modified files:
    trunk/Makefile.in
    trunk/tool/runruby.rb
Index: tool/runruby.rb
===================================================================
--- tool/runruby.rb	(revision 60268)
+++ tool/runruby.rb	(revision 60269)
@@ -78,7 +78,7 @@ runner = File.join(abs_archdir, "exe/rub https://github.com/ruby/ruby/blob/trunk/tool/runruby.rb#L78
 runner = nil unless File.exist?(runner)
 abs_ruby = runner || File.expand_path(ruby)
 env["RUBY"] = abs_ruby
-env["GEM_PATH"] = env["GEM_HOME"] = File.expand_path("spec/rspec", srcdir)
+env["GEM_PATH"] = env["GEM_HOME"] = File.expand_path(".bundle", srcdir)
 env["BUNDLE_RUBY"] = abs_ruby
 env["BUNDLE_GEM"] = "#{abs_ruby} -rrubygems #{srcdir}/bin/gem --backtrace"
 env["PATH"] = [File.dirname(abs_ruby), abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 60268)
+++ Makefile.in	(revision 60269)
@@ -479,12 +479,12 @@ test-bundled-gems-precheck: $(arch)-fake https://github.com/ruby/ruby/blob/trunk/Makefile.in#L479
 yes-test-bundled-gems-prepare: test-bundled-gems-precheck
 	$(Q) $(BASERUBY) $(srcdir)/tool/fetch-bundled_gems.rb $(srcdir)
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
-		--install-dir spec/rspec --conservative 'minitest:~> 5' 'test-unit' 'rake' 'hoe' 'yard' 'packnga'
+		--install-dir .bundle --conservative 'minitest:~> 5' 'test-unit' 'rake' 'hoe' 'yard' 'packnga'
 
 test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
 yes-test-bundled-gems: yes-test-bundled-gems-prepare
 	for gem in minitest test-unit xmlrpc net-telnet did_you_mean power_assert rake; do \
-	  $(XRUBY) -C $(srcdir)/gems/src/$$gem -Ilib ../../../spec/rspec/bin/rake; \
+	  $(XRUBY) -C $(srcdir)/gems/src/$$gem -Ilib ../../../.bundle/bin/rake; \
 	done
 no-test-bundled-gems:
 
@@ -492,14 +492,14 @@ test-bundler-precheck: $(arch)-fake.rb p https://github.com/ruby/ruby/blob/trunk/Makefile.in#L492
 
 yes-test-bundler-prepare: test-bundler-precheck
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
-		--install-dir spec/rspec --conservative 'rspec:~> 3.5'
+		--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 spec/rspec/bin/rspec \
+	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
 		$(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler:
 

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

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