diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-14 00:28:10 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-14 00:28:10 +0000 |
| commit | b51b7dff6ced2e6f32eedefe4eae4950efa829b7 (patch) | |
| tree | fa8374251d00211a8008d3cb0e5e5358b0f83cb5 | |
| parent | 2892f9d870f722cd89a00a61eaae7d5efbc20a02 (diff) | |
| download | ruby-b51b7dff6ced2e6f32eedefe4eae4950efa829b7.tar.gz ruby-b51b7dff6ced2e6f32eedefe4eae4950efa829b7.tar.xz ruby-b51b7dff6ced2e6f32eedefe4eae4950efa829b7.zip | |
reverts r20713
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/minitest/unit.rb | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Sun Dec 14 09:14:37 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * reverts r20713. + Sat Dec 13 22:17:30 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * 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 |