yugui	2009-01-12 22:33:16 +0900 (Mon, 12 Jan 2009)

  New Revision: 21465

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

  Log:
    merges r21449 from trunk into ruby_1_9_1.
    * lib/test/unit/assertions.rb (assert_nothing_raised): removes the
      current trace to get rid of an issue of MiniTest::Unit#location.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/test/unit/assertions.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21464)
+++ ruby_1_9_1/ChangeLog	(revision 21465)
@@ -1,3 +1,12 @@
+Mon Jan 12 17:23:05 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/test/unit/assertions.rb (assert_nothing_raised): removes the
+	  current trace to get rid of an issue of MiniTest::Unit#location.
+
+Mon Jan 12 16:49:20 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* instruby.rb (install): erased a garbage.
+
 Mon Jan 12 16:45:28 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
Index: ruby_1_9_1/lib/test/unit/assertions.rb
===================================================================
--- ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21464)
+++ ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21465)
@@ -22,12 +22,18 @@
           msg = args.pop
         end
         begin
-          yield
+          line = __LINE__; yield
         rescue Exception => e
-          if ((args.empty? && !e.instance_of?(MiniTest::Assertion)) ||
+          bt = e.backtrace
+          as = e.instance_of?(MiniTest::Assertion)
+          if as
+            ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o
+            bt.reject! {|line| ans =~ line}
+          end
+          if ((args.empty? && !as) ||
               args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a })
             msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" }
-            raise MiniTest::Assertion, msg.call, e.backtrace
+            raise MiniTest::Assertion, msg.call, bt
           else
             raise
           end

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