1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

test/ruby/find_executable.rb

* test/ruby/test_rubyoptions.rb (test_program_name): use expected
  ps command from PATH.

* test/ruby/find_executable.rb (EnvUtil#find_executable): find
  expected executable path with argument and output pattern.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-07 08:42:57 +00:00
parent b1f4bf8aa2
commit a560c2086a
3 changed files with 29 additions and 4 deletions

View file

@ -2,6 +2,7 @@
require "open3"
require "timeout"
require "test/unit"
require_relative "find_executable"
module EnvUtil
def rubybin

View file

@ -0,0 +1,19 @@
module EnvUtil
def find_executable(cmd, *args)
exts = RbConfig::CONFIG["EXECUTABLE_EXTS"].split | [RbConfig::CONFIG["EXEEXT"]]
ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
next if path.empty?
path = File.join(path, cmd)
exts.each do |ext|
cmdline = [path + ext, *args]
begin
return cmdline if yield(IO.popen(cmdline, "r", err: [:child, :out], &:read))
rescue
next
end
end
end
nil
end
module_function :find_executable
end

View file

@ -458,8 +458,13 @@ class TestRubyOptions < Test::Unit::TestCase
}
end
if /linux|freebsd|netbsd|openbsd|darwin/ =~ RUBY_PLATFORM
PSCMD = EnvUtil.find_executable("ps", "-o", "command", "-p", $$.to_s) {|out| /ruby/=~out}
PSCMD.pop if PSCMD
end
def test_set_program_name
skip "platform dependent feature" if /linux|freebsd|netbsd|openbsd|darwin/ !~ RUBY_PLATFORM
skip "platform dependent feature" unless defined?(PSCMD) and PSCMD
with_tmpchdir do
write_file("test-script", "$0 = 'hello world'; /test-script/ =~ Process.argv0 or $0 = 'Process.argv0 changed!'; sleep 60")
@ -468,7 +473,7 @@ class TestRubyOptions < Test::Unit::TestCase
ps = nil
10.times do
sleep 0.1
ps = `ps -p #{pid} -o command`
ps = `#{PSCMD.join(' ')} #{pid}`
break if /hello world/ =~ ps
end
assert_match(/hello world/, ps)
@ -478,7 +483,7 @@ class TestRubyOptions < Test::Unit::TestCase
end
def test_setproctitle
skip "platform dependent feature" if /linux|freebsd|netbsd|openbsd|darwin/ !~ RUBY_PLATFORM
skip "platform dependent feature" unless defined?(PSCMD) and PSCMD
with_tmpchdir do
write_file("test-script", "$_0 = $0.dup; Process.setproctitle('hello world'); $0 == $_0 or Process.setproctitle('$0 changed!'); sleep 60")
@ -487,7 +492,7 @@ class TestRubyOptions < Test::Unit::TestCase
ps = nil
10.times do
sleep 0.1
ps = `ps -p #{pid} -o command`
ps = `#{PSCMD.join(' ')} #{pid}`
break if /hello world/ =~ ps
end
assert_match(/hello world/, ps)