summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-29 08:05:26 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-29 08:05:26 +0000
commitce617e4155c50e8e6858fc928be66f887bb08ed8 (patch)
tree1e6dd7a8f0edcb6d694bd3fa956ceccf52041daf
parent680b6c380cd115819a4a296ee6c0a61c3c6e5271 (diff)
downloadruby-ce617e4155c50e8e6858fc928be66f887bb08ed8.tar.gz
ruby-ce617e4155c50e8e6858fc928be66f887bb08ed8.tar.xz
ruby-ce617e4155c50e8e6858fc928be66f887bb08ed8.zip
* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
"miniruby". [ruby-dev:28140] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/envutil.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8395e7fb5..d6254c178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 29 17:02:07 2005 Tanaka Akira <akr@m17n.org>
+
+ * test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
+ "miniruby". [ruby-dev:28140]
+
Tue Dec 27 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 09c8e3f7f..cd9ad3c85 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -3,12 +3,12 @@ module EnvUtil
if ruby = ENV["RUBY"]
return ruby
end
- miniruby = "miniruby"
+ ruby = "ruby"
3.times do
- if File.exist? miniruby or File.exist? miniruby+".exe"
- return File.expand_path(miniruby)
+ if File.exist? ruby or File.exist? ruby+".exe"
+ return File.expand_path(ruby)
end
- miniruby = File.join("..", miniruby)
+ ruby = File.join("..", ruby)
end
begin
require "rbconfig"