From 85c94f9636ab0457047799261f358de723efb339 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 11 Feb 2006 16:13:47 +0000 Subject: * eval.c (eval): no need to push ruby_class. [ruby-dev:28176] * eval.c (rb_f_autoload): check if ruby_cbase is nil (during instance_eval for objects cannot have singleton classes, e.g. fixnums and symbols). [ruby-dev:28178] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index cd9ad3c85..c48132628 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -4,8 +4,12 @@ module EnvUtil return ruby end ruby = "ruby" + rubyexe = ruby+".exe" 3.times do - if File.exist? ruby or File.exist? ruby+".exe" + if File.exist? ruby and File.executable? ruby and !File.directory? ruby + return File.expand_path(ruby) + end + if File.exist? rubyexe and File.executable? rubyexe return File.expand_path(ruby) end ruby = File.join("..", ruby) -- cgit