summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit/parallel.rb2
2 files changed, 6 insertions, 1 deletions
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