diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-08 03:01:55 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-08 03:01:55 +0000 |
commit | 4a7311e12977ca2cd388f609c3c705ba219bfee5 (patch) | |
tree | d7d9c3af6e3e4380649e3a5e4b00c5bf0abdf844 | |
parent | cd6414267feba67f039d0a419ae91ae50ea26cd7 (diff) | |
download | ruby-4a7311e12977ca2cd388f609c3c705ba219bfee5.tar.gz |
avoid dead lock on MacOS X.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_marshal.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index c0e6f996e9..267f435bcb 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -89,13 +89,15 @@ class TestMarshal < Test::Unit::TestCase 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) } |