summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/lib/test/unit/parallel.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07b11b1e9e7..8d417b34515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 4 14:02:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/lib/test/unit/parallel.rb (run): expand the file name to be
+ loaded, so that relative paths work in parallel mode.
+
Sun Jan 4 13:36:56 2015 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* test/test_tempfile.rb: use assert_file for more descriptive message.
diff --git a/test/lib/test/unit/parallel.rb b/test/lib/test/unit/parallel.rb
index ea809f28ae8..65f8a74ca4a 100644
--- a/test/lib/test/unit/parallel.rb
+++ b/test/lib/test/unit/parallel.rb
@@ -112,7 +112,7 @@ module Test
suites = MiniTest::Unit::TestCase.test_suites
begin
- require $1
+ require File.realpath($1)
rescue LoadError
_report "after", Marshal.dump([$1, ProxyError.new($!)])
_report "ready"