diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Feb 8 16:08:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/envutil.rb (assert_separately): check also terminating + signal not only if core dumped. + Fri Feb 8 13:12:04 2013 Eric Hodel <drbrain@segment7.net> * lib/rdoc/generator/darkfish.rb: Set encoding on output template to diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index b640dcd124..02215120dd 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -249,6 +249,8 @@ module Test assert(status.success?, m) end + ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV") + def assert_separately(args, file = nil, line = nil, src, **opt) unless file and line loc, = caller_locations(1,1) @@ -261,8 +263,9 @@ module Test puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" end eom - stdout, _stderr, status = EnvUtil.invoke_ruby(args, src, true, true, opt) - assert(!status.coredump?, FailDesc[status]) + stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, opt) + abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) + assert(!abort, FailDesc[status, stderr]) self._assertions += stdout[/^assertions=(\d+)/, 1].to_i res = Marshal.load(stdout.unpack("m")[0]) return unless res |