[前][次][番号順一覧][スレッド一覧]

ruby-changes:53177

From: k0kubun <ko1@a...>
Date: Sat, 27 Oct 2018 23:06:50 +0900 (JST)
Subject: [ruby-changes:53177] k0kubun:r65392 (trunk): spec/../shared/exit.rb: move the mingw guard to here

k0kubun	2018-10-27 23:06:44 +0900 (Sat, 27 Oct 2018)

  New Revision: 65392

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

  Log:
    spec/../shared/exit.rb: move the mingw guard to here
    
    from terminate_spec.rb, as suggested here:
    https://github.com/ruby/ruby/commit/c7220bd3dea0a113b81f267cc3b656da7d7d7abb#commitcomment-31068714
    
    to guard other inclusions.

  Modified files:
    trunk/spec/ruby/core/thread/shared/exit.rb
    trunk/spec/ruby/core/thread/terminate_spec.rb
Index: spec/ruby/core/thread/terminate_spec.rb
===================================================================
--- spec/ruby/core/thread/terminate_spec.rb	(revision 65391)
+++ spec/ruby/core/thread/terminate_spec.rb	(revision 65392)
@@ -3,9 +3,5 @@ require_relative 'fixtures/classes' https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/thread/terminate_spec.rb#L3
 require_relative 'shared/exit'
 
 describe "Thread#terminate" do
-  # This spec randomly kills mspec worker like: https://ci.appveyor.com/project/ruby/ruby/builds/19390874/job/wv1bsm8skd4e1pxl
-  # TODO: Investigate the cause or at least print helpful logs, and remove this `platform_is_not` guard.
-  platform_is_not :mingw do
-    it_behaves_like :thread_exit, :terminate
-  end
+  it_behaves_like :thread_exit, :terminate
 end
Index: spec/ruby/core/thread/shared/exit.rb
===================================================================
--- spec/ruby/core/thread/shared/exit.rb	(revision 65391)
+++ spec/ruby/core/thread/shared/exit.rb	(revision 65392)
@@ -3,6 +3,10 @@ describe :thread_exit, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/thread/shared/exit.rb#L3
     ScratchPad.clear
   end
 
+  # This spec randomly kills mspec worker like: https://ci.appveyor.com/project/ruby/ruby/builds/19390874/job/wv1bsm8skd4e1pxl
+  # TODO: Investigate the cause or at least print helpful logs, and remove this `platform_is_not` guard.
+  platform_is_not :mingw do
+
   it "kills sleeping thread" do
     sleeping_thread = Thread.new do
       sleep
@@ -173,4 +177,6 @@ describe :thread_exit, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/thread/shared/exit.rb#L177
       t.join.should == t
     end
   end
+
+  end # platform_is_not :mingw
 end

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

[前][次][番号順一覧][スレッド一覧]