summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 01:36:55 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 01:36:55 +0000
commit000e2b816d27980fb30cfb0ee60e92f4a87c50b8 (patch)
tree1d9f47846a08316f32af944aeefbecc8f02abf6c
parentdf25ba40152c936d381a476f4c711f99f5033680 (diff)
test/ruby/test_process.rb: ensure exit! on fork failure
* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): ensure exit! on fork failure git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_process.rb8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4623ffc071..be69c62c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 23 10:22:24 2014 Eric Wong <e@80x24.org>
+
+ * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+ ensure exit! during fork failure
+
Thu Oct 23 10:21:21 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
* NEWS: Added String#unicode_normalize(|!|d?) [ci skip]
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index b314b7f38a..2a13819dca 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1922,6 +1922,7 @@ EOS
er, ew = IO.pipe
unless runner = IO.popen("-")
er.close
+ status = true
begin
$stderr.reopen($stdout)
trap(:QUIT) {}
@@ -1934,10 +1935,13 @@ EOS
$stdout.flush
end
ensure
- ew.puts([Marshal.dump($!)].pack("m0")) if $!
+ if $!
+ ew.puts([Marshal.dump($!)].pack("m0"))
+ status = false
+ end
ew.close
+ exit!(status)
end
- exit!(true)
end
ew.close
begin