From 54ebae1ba1122300a6695bebf64b8609843918e9 Mon Sep 17 00:00:00 2001 From: ntalbott Date: Tue, 18 Nov 2003 23:00:29 +0000 Subject: [PATCH] * lib/test/unit.rb: do not run tests if $! is set. * lib/test/unit/assertionfailederror.rb: extend StandardError instead Exception (irb catches the former but not the latter). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/test/unit.rb | 2 +- lib/test/unit/assertionfailederror.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f7bd695df..de274f4c97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 19 07:54:00 2003 Nathaniel Talbott + + * lib/test/unit.rb: do not run tests if $! is set. + + * lib/test/unit/assertionfailederror.rb: extend StandardError instead + Exception (irb catches the former but not the latter). + Tue Nov 18 23:31:36 2003 WATANABE Hirofumi * missing/memmove.c (memmove): take void *, not char *. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 6fab874f23..ce2eb85da7 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -272,4 +272,4 @@ module Test end end -at_exit{Test::Unit::AutoRunner.run($0) unless(Test::Unit.run?)} +at_exit{Test::Unit::AutoRunner.run($0) unless($! || Test::Unit.run?)} diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb index 9b9e53f16c..0854203675 100644 --- a/lib/test/unit/assertionfailederror.rb +++ b/lib/test/unit/assertionfailederror.rb @@ -8,7 +8,7 @@ module Test module Unit # Thrown by Test::Unit::Assertions when an assertion fails. - class AssertionFailedError < Exception + class AssertionFailedError < StandardError end end end