* 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
This commit is contained in:
parent
9272ca4d2b
commit
d3ba99c15f
@ -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
|
* test/inlinetest.rb (InlineTest::loadtest): requiring library with
|
||||||
replaced $0 can make $0 == __FILE__ block be evaluated twice.
|
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>
|
Wed May 19 11:08:10 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||||
|
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
module EnvUtil
|
module EnvUtil
|
||||||
def rubybin
|
def rubybin
|
||||||
|
if ruby = ENV["RUBY"]
|
||||||
|
return ruby
|
||||||
|
end
|
||||||
miniruby = "miniruby"
|
miniruby = "miniruby"
|
||||||
3.times do
|
3.times do
|
||||||
if File.exist? miniruby or File.exist? miniruby+".exe"
|
if File.exist? miniruby or File.exist? miniruby+".exe"
|
||||||
@ -9,7 +12,6 @@ module EnvUtil
|
|||||||
end
|
end
|
||||||
begin
|
begin
|
||||||
require "rbconfig"
|
require "rbconfig"
|
||||||
ENV["RUBY"] or
|
|
||||||
File.join(
|
File.join(
|
||||||
Config::CONFIG["bindir"],
|
Config::CONFIG["bindir"],
|
||||||
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
|
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user