aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 7da9084207..33faf88901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 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