diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-01 05:12:02 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-01 05:12:02 +0000 |
| commit | e0cde13a3c81c00dbe587968a2c9beec68e0ddf2 (patch) | |
| tree | f816b685110d5676def531fa0a8b81635c2361e1 | |
| parent | b40ff978ee5af1dcb55fbfe9ec3f1d75d9b2c0ed (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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -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). diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index c16aa87896..57e02849b9 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -606,6 +606,7 @@ class TestThread < Test::Unit::TestCase end def test_no_valid_cfp + skip 'with win32ole, cannot run this testcase because win32ole redefines Thread#intialize' if defined?(WIN32OLE) bug5083 = '[ruby-dev:44208]' error = assert_raise(RuntimeError) do Thread.new(&Module.method(:nesting)).join |