summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 15:26:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 15:26:06 +0000
commita6f510959e409cb32e8da6a0b6417ac6325302eb (patch)
tree473819e8a14778da4a688a800b12409b0c27fdc9
parent4450acf4ba10f97b6a5def104dd8c8530fe1ee3d (diff)
merge revision(s) 56684: [Backport #12909]
test_process.rb: fix pgroup test * test/ruby/test_process.rb (TestProcess#test_execopts_pgroup): use dynamically assigned pid for the process group, instead of a magic number 2. [ruby-core:78051] [Bug #12909] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_process.rb6
-rw-r--r--version.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 28617b60b4..28e6a10882 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -181,7 +181,11 @@ class TestProcess < Test::Unit::TestCase
io.close
assert_raise(ArgumentError) { system(*TRUECOMMAND, :pgroup=>-1) }
- assert_raise(Errno::EPERM) { Process.wait spawn(*TRUECOMMAND, :pgroup=>2) }
+ IO.popen([RUBY, '-egets'], 'w') do |f|
+ assert_raise(Errno::EPERM) {
+ Process.wait spawn(*TRUECOMMAND, :pgroup=>f.pid)
+ }
+ end
io1 = IO.popen([RUBY, "-e", "print Process.getpgrp", :pgroup=>true])
io2 = IO.popen([RUBY, "-e", "print Process.getpgrp", :pgroup=>io1.pid])
diff --git a/version.h b/version.h
index 55dd4f1c56..437e3eddbb 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-11-05"
-#define RUBY_PATCHLEVEL 205
+#define RUBY_RELEASE_DATE "2016-11-12"
+#define RUBY_PATCHLEVEL 206
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 12
#include "ruby/version.h"