summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_thread.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f370163f0..3effb1b251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 25 07:45:44 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
+ rid of method redefined.
+
Tue Jan 25 07:00:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_string_value_cstr): rb_str_modify can change
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 26f0f6f937..0df25263bb 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -207,7 +207,7 @@ class TestThread < Test::Unit::TestCase
end.join
end
- def test_condvar_nolock_2
+ def test_condvar_nolock_3
mutex = Mutex.new
condvar = ConditionVariable.new