summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 15:49:01 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 15:49:01 +0000
commit715f997ab706df797dd253d9ee706b1326365eae (patch)
tree0e1764301e50b76a4ad65984b7781e85e155f07c
parent8dbfd4b86c6ec0dce0472a735f30dfcd081ef87c (diff)
merge revision(s) 57492: [Backport #12405]
test_queue.rb: fix portability * test/thread/test_queue.rb (test_queue_with_trap): fix portability. use SIGINT instead of SIGUSR2 which is supported on not all platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/thread/test_queue.rb8
-rw-r--r--version.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index c9ea9f063f..17fcfe8d79 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -543,14 +543,14 @@ class TestQueue < Test::Unit::TestCase
end
def test_queue_with_trap
- assert_in_out_err([], <<-INPUT, %w(USR2 USR2 exit), [])
+ assert_in_out_err([], <<-INPUT, %w(INT INT exit), [])
q = Queue.new
- trap(:USR2){
- q.push 'USR2'
+ trap(:INT){
+ q.push 'INT'
}
Thread.new{
loop{
- Process.kill :USR2, $$
+ Process.kill :INT, $$
}
}
puts q.pop
diff --git a/version.h b/version.h
index 9f72a0ac4e..88676af2d9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-28"
-#define RUBY_PATCHLEVEL 273
+#define RUBY_PATCHLEVEL 274
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3