nagachika	2016-10-18 02:56:49 +0900 (Tue, 18 Oct 2016)

  New Revision: 56440

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56440

  Log:
    merge revision(s) 53520: [Backport #12776]
    
    test_thread.rb: wait for the thread to sleep
    
    * test/ruby/test_thread.rb (test_thread_name): wait for the status
      of the subject thread to fix, so that the status does not change
      between two inspect methods.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/ruby/test_thread.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/test/ruby/test_thread.rb
===================================================================
--- ruby_2_3/test/ruby/test_thread.rb	(revision 56439)
+++ ruby_2_3/test/ruby/test_thread.rb	(revision 56440)
@@ -1052,6 +1052,7 @@ q.pop https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_thread.rb#L1052
 
   def test_thread_name
     t = Thread.start {sleep}
+    sleep 0.001 until t.stop?
     assert_nil t.name
     s = t.inspect
     t.name = 'foo'
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56439)
+++ ruby_2_3/version.h	(revision 56440)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-10-18"
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53520


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