ruby-changes:5513
From: akr <ko1@a...>
Date: Sun, 8 Jun 2008 12:02:00 +0900 (JST)
Subject: [ruby-changes:5513] Ruby:r17016 (trunk): avoid dead lock on MacOS X.
akr 2008-06-08 12:01:55 +0900 (Sun, 08 Jun 2008) New Revision: 17016 Modified files: trunk/test/ruby/test_marshal.rb Log: avoid dead lock on MacOS X. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_marshal.rb?r1=17016&r2=17015&diff_format=u Index: test/ruby/test_marshal.rb =================================================================== --- test/ruby/test_marshal.rb (revision 17015) +++ test/ruby/test_marshal.rb (revision 17016) @@ -89,13 +89,15 @@ o1 = C.new("a" * 10000) r, w = IO.pipe + t = Thread.new { Marshal.load(r) } Marshal.dump(o1, w) - o2 = Marshal.load(r) + o2 = t.value assert_equal(o1.str, o2.str) r, w = IO.pipe + t = Thread.new { Marshal.load(r) } Marshal.dump(o1, w, 2) - o2 = Marshal.load(r) + o2 = t.value assert_equal(o1.str, o2.str) assert_raise(TypeError) { Marshal.dump("foo", Object.new) } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/