summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-01 05:12:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-01 05:12:02 +0000
commite0cde13a3c81c00dbe587968a2c9beec68e0ddf2 (patch)
treef816b685110d5676def531fa0a8b81635c2361e1 /ChangeLog
parentb40ff978ee5af1dcb55fbfe9ec3f1d75d9b2c0ed (diff)
backported r33153 from trunk.
* test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when win32ole is required. in such case, win32ole redefines Thread#initialize, and the block argument becomes to be not the top of the thread, then this testcase always fails. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7aebc2d93a..2297d6e6fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 1 14:11:16 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
+ win32ole is required. in such case, win32ole redefines
+ Thread#initialize, and the block argument becomes to be not the top
+ of the thread, then this testcase always fails.
+
Wed Aug 31 16:02:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).