diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 20:28:10 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 20:28:10 +0000 |
commit | c8473b46ae096e1e2cc2b377a19f9735ff56c598 (patch) | |
tree | 065b031099ac4d8aa67c3fc00b79cde09d32debd /test/-ext-/old_thread_select | |
parent | b1ab5d1b424de2c493706e56ed192ee5b95d59ea (diff) |
merge revision(s) 33130:
* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
typo.
* test/-ext-/old_thread_select/test_old_thread_select.rb
(TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
of SIGUSR1 because the former is general and the latter is platform
dependent.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/-ext-/old_thread_select')
-rw-r--r-- | test/-ext-/old_thread_select/test_old_thread_select.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/-ext-/old_thread_select/test_old_thread_select.rb b/test/-ext-/old_thread_select/test_old_thread_select.rb index 886ee70cfa..d965724c83 100644 --- a/test/-ext-/old_thread_select/test_old_thread_select.rb +++ b/test/-ext-/old_thread_select/test_old_thread_select.rb @@ -41,12 +41,12 @@ class TestOldThreadSelect < Test::Unit::TestCase def test_old_select_signal_safe return unless Process.respond_to?(:kill) - usr1 = false - trap(:USR1) { usr1 = true } + received = false + trap(:INT) { received = true } main = Thread.current thr = Thread.new do Thread.pass until main.stop? - Process.kill(:USR1, $$) + Process.kill(:INT, $$) true end @@ -62,8 +62,8 @@ class TestOldThreadSelect < Test::Unit::TestCase assert diff >= 1.0, "interrupted or short wait" assert_equal 0, rc assert_equal true, thr.value - assert usr1, "USR1 not received" + assert received, "SIGINT not received" ensure - trap(:USR1, "DEFAULT") + trap(:INT, "DEFAULT") end end |