diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-11 16:13:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-11 16:13:47 +0000 |
commit | 02de06ef1a9df0fd3e76328d402b1a62bb5cece8 (patch) | |
tree | 71524d5fac65653e9e9aa09305c7b25c9895688f /test | |
parent | d9e9972d31c8a28b7ac88f1b08d22229ca501520 (diff) |
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/drb/drbtest.rb | 2 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 30aafb5788..6f05de70c1 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -16,7 +16,7 @@ class DRbService @@ruby += " -d" if $DEBUG def self.add_service_command(nm) dir = File.dirname(File.expand_path(__FILE__)) - DRb::ExtServManager.command[nm] = "#{@@ruby} #{dir}/#{nm}" + DRb::ExtServManager.command[nm] = "#{@@ruby} -d #{dir}/#{nm}" end %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm| diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index cd9ad3c858..c481326288 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) |