merges revision 6057 in MiniTest's repository into ruby_1_9_2.

--
+ Exit autorun via nested at_exit handler, in case other libs call

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index 5a69064578..0a45932079 100644
--- a/lib/minitest/unit.rb
+++ b/lib/minitest/unit.rb
@@ -497,8 +497,15 @@ module MiniTest
     def self.autorun
       at_exit {
         next if $! # don't run if there was an exception
+
+        # the order here is important. The at_exit handler must be
+        # installed before anyone else gets a chance to install their
+        # own, that way we can be assured that our exit will be last
+        # to run (at_exit stacks).
+        exit_code = nil
+
+        at_exit { exit false if exit_code && exit_code != 0 }
         exit_code = MiniTest::Unit.new.run(ARGV)
-        exit false if exit_code && exit_code != 0
       } unless @@installed_at_exit
       @@installed_at_exit = true
     end