summaryrefslogtreecommitdiff
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
commit99ee69b9f2634e9ba8868d8fff964bcf98ed5748 (patch)
tree75003e54ff868a30555bf69050ecf94fb88ebd5b
parenta274020ff7fb3bf6e23a97550ee8144a6fe903be (diff)
* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
"miniruby". [ruby-dev:28140] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@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 894ea9e2e7..fc9fc3ce75 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]
+
Thu Dec 29 11:22:34 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/generator.rb: reimplemented Generator class with Thread instead of
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 09c8e3f7f4..cd9ad3c858 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"