summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/minitest/test_minitest_unit.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 484d388987..052453942d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 29 15:10:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test/minitest/test_minitest_unit.rb: restore orig_verbose only
+ if it is set. This broke rdoc's tests.
+ http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20121129T050102Z.diff.html.gz
+
Thu Nov 29 14:56:30 2012 Koichi Sasada <ko1@atdot.net>
* vm_trace.c (rb_tracepoint_attr_method_id):
diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb
index 45bd96fcd4..a03296d7b6 100644
--- a/test/minitest/test_minitest_unit.rb
+++ b/test/minitest/test_minitest_unit.rb
@@ -1343,7 +1343,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
assert_equal "hi\n", out
assert_equal "bye!\n", err
ensure
- $VERBOSE = orig_verbose
+ $VERBOSE = orig_verbose unless orig_verbose.nil?
end
def test_class_asserts_match_refutes