summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-30 04:57:06 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-30 04:57:06 +0000
commitb43dae5873c70ff9506e65a04dc983b78c9c28df (patch)
tree3939b78d6f1339b00313fcc88fffdd8b0175e996
parentabf17f35866f271a8cb9f47ac9b2ed0a4cfc02a0 (diff)
Updated miniunit to 1.3.0 r4256.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mini/test.rb7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d8307c3ce..015232c5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,10 @@ Tue Sep 30 13:19:01 2008 Eric Hodel <drbrain@segment7.net>
* test/rubygems/test_gem_installer.rb: remove extra call to setup to
fix ENV['HOME'] pollution.
-Tue Sep 30 13:04:11 2008 Ryan Davis <ryan@wrath.local>
+Tue Sep 30 13:04:11 2008 Ryan Davis <ryand-ruby@zenspider.com>
- * lib/mini/test.rb: Updated to 1.3.0 r4255.
+ * lib/mini/test.rb: Updated to 1.3.0 r4256.
* test/mini/*: added from r4255.
- * lib/mini/test.rb: rolled out change 19608... not 1.8 compatible.
Tue Sep 30 07:46:07 2008 Eric Hodel <drbrain@segment7.net>
diff --git a/lib/mini/test.rb b/lib/mini/test.rb
index bb5fc07724..1d76b40974 100644
--- a/lib/mini/test.rb
+++ b/lib/mini/test.rb
@@ -24,6 +24,7 @@ module Mini
__FILE__
end
+ # './lib' in project dir, or '/usr/local/blahblah' if installed
MINI_DIR = File.dirname(File.dirname(file))
def self.filter_backtrace bt
@@ -31,11 +32,11 @@ module Mini
new_bt = []
bt.each do |line|
- break if line.index(MINI_DIR) == 0
+ break if line.rindex(MINI_DIR, 0)
new_bt << line
end
- new_bt = bt.reject { |line| line.index(MINI_DIR) == 0 } if
+ new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if
new_bt.empty?
new_bt = bt.dup if new_bt.empty?
@@ -320,7 +321,7 @@ module Mini
def self.autorun
at_exit {
exit_code = Mini::Test.new.run(ARGV)
- exit false if exit_code
+ exit false if exit_code && exit_code != 0
} unless @@installed_at_exit
@@installed_at_exit = true
end