summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 06:15:22 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 06:15:22 +0000
commit4b2c280df9727eefff5c278cda7974f8e1322554 (patch)
tree3908b4c328928c68e8ac331b78275c958bc86bb7
parent17e8f185ded0d4f319ac835a08aaf6b2dabcffe4 (diff)
merges r21273 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb (test_wait_and_sigchild): remove debug output. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_process.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6093f88f32..cb5b498097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 2 22:20:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
+ output.
+
Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
* signal.c (rb_signal_buff_size): defined for check whether signal
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 072e7742dc..9a8f45e67d 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1013,7 +1013,7 @@ class TestProcess < Test::Unit::TestCase
def test_wait_and_sigchild
signal_received = []
- Signal.trap(:CHLD) { signal_received << true; puts "child died" }
+ Signal.trap(:CHLD) { signal_received << true }
pid = fork { sleep 1; exit }
Thread.start { raise }
Process.wait pid