diff options
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) |