summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/minitest/unit.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f6b9c5547..f9a3540ec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 16 13:39:24 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/minitest/unit.rb: temporarily merges Kouji's patch without
+ maintainer's permission in order to release 1.9.1 RC2.
+ [ruby-core:21364] .
+ Patch by Takao Kouji <kouji AT takao7.net>.
+
Fri Jan 16 13:28:09 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/minitest/test_mini_test.rb: the number of assertions must be
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index 77bcee99ee..9a7239bac8 100644
--- a/lib/minitest/unit.rb
+++ b/lib/minitest/unit.rb
@@ -331,7 +331,7 @@ module MiniTest
def self.autorun
at_exit {
- return if $! # don't run if there was an exception
+ next if $! # don't run if there was an exception
exit_code = MiniTest::Unit.new.run(ARGV)
exit false if exit_code && exit_code != 0
} unless @@installed_at_exit