summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-21 13:17:54 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-21 13:17:54 +0000
commit31cc5b1505c38d3d5761f179e84f04a8966ccd3b (patch)
tree41e9343b106f383cb4340129fa14c208d3bd61d1 /Makefile.in
parent1493972e8234cd5d57881d2353d153aa7cd67e72 (diff)
Rename spec/rspec to .bundle.
It used without rspec installation for test-* task. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 4 insertions, 4 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: