diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rwxr-xr-x | tool/runruby.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 6578ef432a..091937bafe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -479,12 +479,12 @@ test-bundled-gems-precheck: $(arch)-fake.rb programs 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 programs 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: diff --git a/tool/runruby.rb b/tool/runruby.rb index cdbc1c0765..d91f6e3bf8 100755 --- a/tool/runruby.rb +++ b/tool/runruby.rb @@ -78,7 +78,7 @@ runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}") 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) |