diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-16 18:11:49 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-16 18:11:49 +0000 |
| commit | 585e1594c943ee79f1958598a96919246e87593f (patch) | |
| tree | 004b927eb3a750fa1b871672b76c2427263f9ab6 | |
| parent | b7a0038505f797777969c248ed027b1481269cd8 (diff) | |
Revert r47971, r47972 [ruby-core:65764]
The current implementation currently delivers signals to self
immediately and synchronously, so we do not need explicit,
potentially-confusing sleeps to wait for signal delivery.
* test/-ext-/bug_reporter/test_bug_reporter.rb
(test_bug_reporter_add): revert r47972
* test/ruby/test_rubyoptions.rb (test_segv_test): revert r47971
[ruby-core:65764]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/-ext-/bug_reporter/test_bug_reporter.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Oct 17 03:05:08 2014 Eric Wong <e@80x24.org> + + * test/-ext-/bug_reporter/test_bug_reporter.rb + (test_bug_reporter_add): revert r47972 + * test/ruby/test_rubyoptions.rb (test_segv_test): revert r47971 + [ruby-core:65764] + Thu Oct 16 23:17:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * signal.c (rb_sigaltstack_size): double default size to get rid diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb index c67dce1e2b..f36f7a08ff 100644 --- a/test/-ext-/bug_reporter/test_bug_reporter.rb +++ b/test/-ext-/bug_reporter/test_bug_reporter.rb @@ -16,7 +16,7 @@ class TestBugReporter < Test::Unit::TestCase args = ["--disable-gems", "-r-test-/bug_reporter/bug_reporter", "-C", tmpdir] - stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$; sleep" + stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$" _, stderr, status = EnvUtil.invoke_ruby(args, stdin, false, true) stderr.force_encoding("ASCII-8BIT") assert_pattern_list(expected_stderr, stderr) diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 45a1612697..d4e5b2ac9c 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -569,7 +569,7 @@ class TestRubyOptions < Test::Unit::TestCase end def test_segv_test - assert_segv(["--disable-gems", "-e", "Process.kill :SEGV, $$; sleep"]) + assert_segv(["--disable-gems", "-e", "Process.kill :SEGV, $$"]) end def test_segv_loaded_features |