summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-14 00:28:10 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-14 00:28:10 +0000
commit20e33b2e06f663225ba63206bbc6144fd989d4f0 (patch)
treefa8374251d00211a8008d3cb0e5e5358b0f83cb5
parent555d766f1c13edf265c332d6f721e262be01a72f (diff)
reverts r20713
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/minitest/unit.rb8
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c378816851..4e1c5f6b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7807e2e3eb..77176240c5 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