ryan	2008-09-30 13:17:56 +0900 (Tue, 30 Sep 2008)

  New Revision: 19636

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19636

  Log:
    rolled out change 19608... not 1.8 compatible.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mini/test.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19635)
+++ ChangeLog	(revision 19636)
@@ -2,6 +2,7 @@
 
 	* lib/mini/test.rb: Updated to 1.3.0 r4255.
 	* test/mini/*: added from r4255.
+	* lib/mini/test.rb: rolled out change 19608... not 1.8 compatible.
 
 Tue Sep 30 07:46:07 2008  Eric Hodel  <drbrain@s...>
 
Index: lib/mini/test.rb
===================================================================
--- lib/mini/test.rb	(revision 19635)
+++ lib/mini/test.rb	(revision 19636)
@@ -14,18 +14,28 @@
   class Assertion < Exception; end
   class Skip < Assertion; end
 
-  MINI_DIR = File.expand_path("../..", __FILE__)
+  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))
+
   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?
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/