archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

backported r33153 from trunk.

Browse source 
* 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
This commit is contained in:
usa 2011-09-01 05:12:02 +00:00
parent b40ff978ee
commit e0cde13a3c
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Wed Aug 31 16:02:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac). * ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).

1
test/ruby/test_thread.rb
View file

@ -606,6 +606,7 @@ class TestThread < Test::Unit::TestCase
end end
def test_no_valid_cfp def test_no_valid_cfp
skip 'with win32ole, cannot run this testcase because win32ole redefines Thread#intialize' if defined?(WIN32OLE)
bug5083 = '[ruby-dev:44208]' bug5083 = '[ruby-dev:44208]'
error = assert_raise(RuntimeError) do error = assert_raise(RuntimeError) do
Thread.new(&Module.method(:nesting)).join Thread.new(&Module.method(:nesting)).join