summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-09 22:08:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-09 22:08:01 +0000
commit06af3b204c6c6202b26674d90145489d2917e07f (patch)
treed273a1452ca9750a23f938d08bc613c6a707a600 /Makefile.in
parent7451ec065cc09758a49bbbf696b57da23e7f83ea (diff)
runruby.rb: set envvars for bundler
* tool/runruby.rb: set gem and bundler environment variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index b977e8c6fd..2764fe2211 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -479,13 +479,14 @@ test-bundler-precheck: $(arch)-fake.rb programs
test-bundler-prepare: test-bundler-precheck
$(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
--install-dir spec/rspec --conservative 'rspec:~> 3.5'
+
+RSPECOPTS = --format progress
+BUNDLER_SPECS = $(srcdir)/spec/bundler
test-bundler: $(TEST_RUNNABLE)-test-bundler
-yes-test-bundler: test-bundler-precheck test-bundler-prepare
+yes-test-bundler: test-bundler-prepare
$(gnumake_recursive)$(Q) \
- GEM_HOME=spec/rspec GEM_PATH=spec/rspec \
- BUNDLE_RUBY="$(abspath ./ruby) -I$(abspath $(srcdir)/lib) -I$(abspath .) -I$(abspath $(EXTOUT)/common) -I$(abspath $(EXTOUT)/$(arch))" \
- BUNDLE_GEM="$(abspath ./ruby) -I$(abspath $(srcdir)/lib) -I$(abspath .) -I$(abspath $(EXTOUT)/common) -I$(abspath $(EXTOUT)/$(arch)) -rubygems $(abspath $(srcdir)/bin/gem) --backtrace" \
- $(XRUBY) -C $(srcdir) -Ispec/bundler "spec/rspec/bin/rspec" --format progress spec/bundler
+ $(XRUBY) -C $(srcdir) -Ispec/bundler spec/rspec/bin/rspec \
+ $(RSPECOPTS) $(BUNDLER_SPECS)
no-test-bundler:
update-src::