summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/test/unit.rb2
-rw-r--r--lib/test/unit/assertionfailederror.rb2
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 <ntalbott@ruby-lang.org>
+
+ * 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 <eban@ruby-lang.org>
* 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