From b51b7dff6ced2e6f32eedefe4eae4950efa829b7 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 14 Dec 2008 00:28:10 +0000 Subject: reverts r20713 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/minitest/unit.rb | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c37881685..4e1c5f6b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Dec 14 09:14:37 2008 Yuki Sonoda (Yugui) + + * reverts r20713. + Sat Dec 13 22:17:30 2008 Yuki Sonoda (Yugui) * common.mk (help): describes more targets. diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 7807e2e3e..77176240c 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -336,12 +336,8 @@ p $! end def location e - e.backtrace.reverse.inject(""){ |last, s| - if s =~ /in .(assert|refute|flunk$|pass$|fail$|raise$)/ - break last - else - s - end + e.backtrace.find { |s| + s !~ /in .(assert|refute|flunk|pass|fail|raise)/ }.sub(/:in .*$/, '') end -- cgit