From 43db70fb9982debd313e78d3f2bca7b003b6849f Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 3 Feb 2006 09:15:42 +0000 Subject: * eval.c: unify ruby_class (for method definition) and ruby_cbase (for constant reference). * eval.c (rb_call0): use TMP_ALLOC() instead of allocating a temporary array object. * eval.c (eval): need not to protect $SAFE value. [ruby-core:07177] * error.c (Init_Exception): change NameError to direct subclass of Exception so that default rescue do not handle it silently. * struct.c (rb_struct_select): update RDoc description. [ruby-core:7254] * numeric.c (int_upto): return an enumerator if no block is attached to the method. * numeric.c (int_downto): ditto. * numeric.c (int_dotimes): ditto. * enum.c (enum_first): new method Enumerable#first to take first n element from an enumerable. * enum.c (enum_group_by): new method Enumerable#group_by that groups enumerable values according to their block values. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index cd9ad3c85..cf7f6e988 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -1,11 +1,18 @@ module EnvUtil def rubybin + unless ENV["RUBYOPT"] + + end if ruby = ENV["RUBY"] 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