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 | 528a7044b9e3b6a99d68fe92a1b383a60cdabb7e (patch) | |
| tree | bc0cc99321d1bc94c24503c2f3c8b3c74a34f37e | |
| parent | 34d833279dacf4789b576edb4d7038b97a9108d7 (diff) | |
| download | ruby-528a7044b9e3b6a99d68fe92a1b383a60cdabb7e.tar.gz ruby-528a7044b9e3b6a99d68fe92a1b383a60cdabb7e.tar.xz ruby-528a7044b9e3b6a99d68fe92a1b383a60cdabb7e.zip | |
reverts r20713
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@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. + Sun Dec 14 01:35:48 2008 Tanaka Akira <akr@fsij.org> * process.c (forked_child): new variable. 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 |