diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-09 22:08:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-09 22:08:01 +0000 |
commit | 06af3b204c6c6202b26674d90145489d2917e07f () | |
tree | d273a1452ca9750a23f938d08bc613c6a707a600 | |
parent | 7451ec065cc09758a49bbbf696b57da23e7f83ea (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
-rw-r--r-- | Makefile.in | 11 | ||||
-rwxr-xr-x | tool/runruby.rb | 6 |
2 files changed, 11 insertions, 6 deletions
@@ -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' test-bundler: $(TEST_RUNNABLE)-test-bundler -yes-test-bundler: test-bundler-precheck 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 no-test-bundler: update-src:: @@ -76,7 +76,11 @@ env = { runner = File.join(abs_archdir, "ruby-runner#{config['EXEEXT']}") runner = nil unless File.exist?(runner) -env["RUBY"] = runner || File.expand_path(ruby) env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) if e = ENV["RUBYLIB"] |