diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-19 14:45:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-19 14:45:49 +0000 |
| commit | d3ba99c15f6e787957c24dedd8796b68e60739c2 (patch) | |
| tree | 78cdad72b6f89bba1f907a3dd3194aefc4611105 | |
| parent | 9272ca4d2b181842b7d322fe90a38bd5d2974cb8 (diff) | |
* test/ruby/envutil.rb (EnvUtil::rubybin): give priority to
environment variable. [ruby-dev:23538]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,8 +1,10 @@ -Wed May 19 18:00:44 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed May 19 23:45:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/inlinetest.rb (InlineTest::loadtest): requiring library with replaced $0 can make $0 == __FILE__ block be evaluated twice. - [ruby-dev:23538] + + * test/ruby/envutil.rb (EnvUtil::rubybin): give priority to + environment variable. [ruby-dev:23538] Wed May 19 11:08:10 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 38dba96c93..09c8e3f7f4 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -1,5 +1,8 @@ module EnvUtil def rubybin + if ruby = ENV["RUBY"] + return ruby + end miniruby = "miniruby" 3.times do if File.exist? miniruby or File.exist? miniruby+".exe" @@ -9,7 +12,6 @@ module EnvUtil end begin require "rbconfig" - ENV["RUBY"] or File.join( Config::CONFIG["bindir"], Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] |