From 6952b1a52a2bd4757b524173edf7ffa31b98fdf2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Sep 2008 09:39:53 +0000
Subject: [PATCH] * lib/mini/test.rb (MINI_DIR): loaded path is expanded.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  4 ++++
 lib/mini/test.rb | 16 +++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a9cabdb04..72a13adb58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 28 18:39:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mini/test.rb (MINI_DIR): loaded path is expanded.
+
 Sun Sep 28 12:36:09 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_exec.c (vm_exec_core): add an UNLIKELY() hint.
diff --git a/lib/mini/test.rb b/lib/mini/test.rb
index e08d4dd93e..a8a65821a5 100644
--- a/lib/mini/test.rb
+++ b/lib/mini/test.rb
@@ -13,28 +13,18 @@
 module Mini
   class Assertion < Exception; end
 
-  file = if __FILE__ =~ /^[^\.]/ then # OMG ruby 1.9 is so lame (rubinius too)
-           require 'pathname'
-           pwd = Pathname.new(Dir.pwd)
-           pn = Pathname.new(File.expand_path(__FILE__))
-           pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
-           pn.to_s
-         else
-           __FILE__
-         end
-
-  MINI_DIR = File.dirname(File.dirname(file))
+  MINI_DIR = File.expand_path("../..", __FILE__)
 
   def self.filter_backtrace bt
     return ["No backtrace"] unless bt
 
     new_bt = []
     bt.each do |line|
-      break if line.index(MINI_DIR) == 0
+      break if line.index(MINI_DIR, 0)
       new_bt << line
     end
 
-    new_bt = bt.reject { |line| line.index(MINI_DIR) == 0 } if
+    new_bt = bt.reject { |line| line.index(MINI_DIR, 0) } if
       new_bt.empty?
     new_bt = bt.dup if new_bt.empty?