From d07346a1021039cc239bffd9286f03f13f5098d0 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 Nov 2012 12:09:19 +0000
Subject: [PATCH] * lib/test/unit/parallel.rb (Test::Unit::Worker.run): wrap
 LoadError   because it's Gem::LoadError sometimes.  see [Bug #6882]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 5 +++++
 lib/test/unit/parallel.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9e3d44a202..8373d5e77a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 30 21:07:56 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit/parallel.rb (Test::Unit::Worker.run): wrap LoadError
+	  because it's Gem::LoadError sometimes.  see [Bug #6882]
+
 Fri Nov 30 20:47:44 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* thread.c: TracePoint#self returns invoking/exitting thread object
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
index 921c6b0b02..d1891838f7 100644
--- a/lib/test/unit/parallel.rb
+++ b/lib/test/unit/parallel.rb
@@ -113,7 +113,7 @@ module Test
               begin
                 require $1
               rescue LoadError
-                _report "after", Marshal.dump([$1, $!])
+                _report "after", Marshal.dump([$1, ProxyError.new($!)])
                 _report "ready"
                 next
               end