Skip to content

Commit

Permalink
show parent process's signal mask from child process
Browse files Browse the repository at this point in the history
Because this tests raises timeout on failure, and it doesn't
reach assertions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed Oct 30, 2015
1 parent a4a29af commit 3077816
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions test/ruby/test_gc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,6 @@ def test_exception_in_finalizer
end;
end

def get_signal_info
if RUBY_PLATFORM.include?('solaris')
"\n"+`/usr/bin/psig #{$$}`
elsif File.exist?('/proc/self/status')
"\n"+IO.read('/proc/self/status')
else
''
end
end

def test_interrupt_in_finalizer
bug10595 = '[ruby-core:66825] [Bug #10595]'
src = <<-'end;'
Expand All @@ -350,8 +340,13 @@ def test_interrupt_in_finalizer
sleep 0.1
Process.kill("INT", pid) rescue break
}
$stderr.puts `/usr/bin/psig #{$$}` if RUBY_PLATFORM.include?('solaris')
$stderr.puts IO.read('/proc/self/status') if File.exist?('/proc/self/status')
if RUBY_PLATFORM.include?('solaris')
$stderr.puts `/usr/bin/psig #{$$}`
$stderr.puts `/usr/bin/psig #{Process.ppid}`
elsif File.exist?('/proc/self/status')
$stderr.puts IO.read('/proc/self/status')
$stderr.puts IO.read("/proc/#{Process.ppid}/status")
end
end
f = proc {1000.times {}}
loop do
Expand All @@ -364,7 +359,7 @@ def test_interrupt_in_finalizer
unless /mswin|mingw/ =~ RUBY_PLATFORM
assert_equal("INT", Signal.signame(status.termsig), bug10595)
end
assert_match(/Interrupt/, err.first, proc {err.join("\n")+get_signal_info})
assert_match(/Interrupt/, err.first, proc {err.join("\n")})
assert_empty(out)
end

Expand Down

0 comments on commit 3077816

Please sign in to comment.