summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 14:45:39 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-19 14:45:39 +0000
commit44900eec0ec9b52c7d9dbbcf0e5aaf01331faba5 (patch)
tree3956c40d6f040826f7290d54ad3288c4665d60fa
parentf56c0c063174caa417ca1e54d59d76c266026bbf (diff)
merge revision(s) 41411:
test_signal.rb: extra quotes * test/ruby/test_signal.rb (TestSignal#test_signal_process_group): remove extra quotes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_signal.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 1de522ee2e..60832eecb1 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -43,7 +43,7 @@ class TestSignal < Test::Unit::TestCase
bug4362 = '[ruby-dev:43169]'
assert_nothing_raised(bug4362) do
- pid = Process.spawn(EnvUtil.rubybin, '-e', '"sleep 10"', :pgroup => true)
+ pid = Process.spawn(EnvUtil.rubybin, '-e', 'sleep 10', :pgroup => true)
Process.kill(:"-TERM", pid)
Process.waitpid(pid)
assert_equal(true, $?.signaled?)
diff --git a/version.h b/version.h
index 39ec47a970..5255184628 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-19"
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6