diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-30 11:59:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-30 11:59:26 +0000 |
| commit | 76be4743ba01bef323ec555fb5c961c116fc225b (patch) | |
| tree | 95f95018c992eb8e3817423367f5560603db09b7 /test | |
| parent | cf02692f3e8ea74378eb25a78a46b5a34db4c908 (diff) | |
test_rubyoptions.rb: ruby-runner sets $0 to install name now
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/envutil.rb | 3 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb index 152ea741c9..dac59bd984 100644 --- a/test/lib/envutil.rb +++ b/test/lib/envutil.rb @@ -282,10 +282,7 @@ if defined?(RbConfig) attr_reader :ruby end dir = File.dirname(ruby) - name = File.basename(ruby, CONFIG['EXEEXT']) CONFIG['bindir'] = dir - CONFIG['ruby_install_name'] = name - CONFIG['RUBY_INSTALL_NAME'] = name Gem::ConfigMap[:bindir] = dir if defined?(Gem::ConfigMap) end end diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 7f22df6479..caf00b2328 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -449,7 +449,8 @@ class TestRubyOptions < Test::Unit::TestCase def test_notfound notexist = "./notexist.rb" - rubybin = EnvUtil.rubybin.dup + dir, *rubybin = RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME', 'EXEEXT') + rubybin = "#{dir}/#{rubybin.join('')}" rubybin.gsub!(%r(/), '\\') if /mswin|mingw/ =~ RUBY_PLATFORM rubybin = Regexp.quote(rubybin) pat = Regexp.quote(notexist) |