summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:45:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:45:47 +0000
commitce094d1d73c46e90319ad4dcbd504c33740b710b (patch)
tree935d0536a9a315e0623b4b56b99f34c4e265dc45 /test
parent560c2da384574e3ccbeb9f4b15747a2e22eeb621 (diff)
merge revision(s) 47837: [Backport #12155]
* test/ruby/test_process.rb (TestProcess#test_setsid): AIX does not allow Process::getsid(pid) when pid is in a different session. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_process.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index bb34e22454..0a97ba76ec 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1689,9 +1689,9 @@ class TestProcess < Test::Unit::TestCase
def test_setsid
return unless Process.respond_to?(:setsid)
return unless Process.respond_to?(:getsid)
- # OpenBSD doesn't allow Process::getsid(pid) when pid is in
+ # OpenBSD and AIX don't allow Process::getsid(pid) when pid is in
# different session.
- return if /openbsd/ =~ RUBY_PLATFORM
+ return if /openbsd|aix/ =~ RUBY_PLATFORM
IO.popen([RUBY, "-e", <<EOS]) do|io|
Marshal.dump(Process.getsid, STDOUT)