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

envutil.rb: signal in Process::Status

Browse source 
* test/ruby/envutil.rb (assert_ruby_status): show status info.

* test/ruby/envutil.rb (Test::Unit::Assertions::FailDesc): use
  Signal.signame for consistency with Process::Status#inspect.

* signal.c (siglist): prefer SIGABRT over SIGIOT in Signal.signame.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-25 05:39:29 +00:00
parent e37f8c0f0b
commit 985deb62eb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
signal.c
View file

@ -71,12 +71,12 @@ static const struct signals {
#ifdef SIGTRAP #ifdef SIGTRAP
{"TRAP", SIGTRAP}, {"TRAP", SIGTRAP},
#endif #endif
#ifdef SIGIOT
{"IOT", SIGIOT},
#endif
#ifdef SIGABRT #ifdef SIGABRT
{"ABRT", SIGABRT}, {"ABRT", SIGABRT},
#endif #endif
#ifdef SIGIOT
{"IOT", SIGIOT},
#endif
#ifdef SIGEMT #ifdef SIGEMT
{"EMT", SIGEMT}, {"EMT", SIGEMT},
#endif #endif

4
test/ruby/envutil.rb
View file

@ -220,7 +220,7 @@ module Test
pid = status.pid pid = status.pid
faildesc = proc do faildesc = proc do
signo = status.termsig signo = status.termsig
signame = Signal.list.invert[signo] signame = Signal.signame(signo)
sigdesc = "signal #{signo}" sigdesc = "signal #{signo}"
if signame if signame
sigdesc = "SIG#{signame} (#{sigdesc})" sigdesc = "SIG#{signame} (#{sigdesc})"
@ -270,7 +270,7 @@ module Test
def assert_ruby_status(args, test_stdin="", message=nil, opt={}) def assert_ruby_status(args, test_stdin="", message=nil, opt={})
out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, opt) out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, opt)
message ||= "ruby exit status is not success:" message ||= "ruby exit status is not success:"
assert(status.success?, FailDesc[status, message, out]) assert(status.success?, FailDesc[status, "#{message} (#{status.inspect})", out])
end end
ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV") ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV")