2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aeebf56a5e..9128cb66ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  2 23:55:51 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): expand
+	  real path to get rid of loading same files via symlinks.
+
 Wed May  2 23:26:04 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* cont.c (rb_fiber_m_transfer): improve sample code in Fiber#transfer
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 311d758a81..ac15a95b07 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -228,7 +228,7 @@ module Test
         return false if !super
         result = false
         files.each {|f|
-          d = File.dirname(path = File.expand_path(f))
+          d = File.dirname(path = File.realpath(f))
           unless $:.include? d
             $: << d
           end