usa	2011-09-01 14:12:02 +0900 (Thu, 01 Sep 2011)

  New Revision: 33154

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33154

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_thread.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33153)
+++ ruby_1_9_3/ChangeLog	(revision 33154)
@@ -1,3 +1,10 @@
+Thu Sep  1 14:11:16 2011  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
Index: ruby_1_9_3/test/ruby/test_thread.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_thread.rb	(revision 33153)
+++ ruby_1_9_3/test/ruby/test_thread.rb	(revision 33154)
@@ -606,6 +606,7 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/