1 files changed, 37 insertions, 21 deletions

diff --git a/spec/ruby/optional/capi/thread_spec.rb b/spec/ruby/optional/capi/thread_spec.rb
index 30e29681eb..75e0b94fdf 100644
--- a/spec/ruby/optional/capi/thread_spec.rb
+++ b/spec/ruby/optional/capi/thread_spec.rb
@@ -50,7 +50,7 @@ describe "C-API Thread function" do
     end
 
     it "returns nil if the value has not been set" do
-      @t.rb_thread_local_aref(Thread.current, :thread_capi_specs_undefined).should be_nil
+      @t.rb_thread_local_aref(Thread.current, :thread_capi_specs_undefined).should == nil
     end
   end
 
@@ -72,7 +72,7 @@ describe "C-API Thread function" do
       obj = Object.new
       proc = -> x { ScratchPad.record x }
       thr = @t.rb_thread_create(proc, obj)
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
       thr.join
       ScratchPad.recorded.should == obj
     end
@@ -83,24 +83,34 @@ describe "C-API Thread function" do
         raise "my error"
       }
       thr = @t.rb_thread_create(prc, nil)
-      thr.should be_kind_of(Thread)
+      thr.should.is_a?(Thread)
 
       -> {
         thr.join
-      }.should raise_error(RuntimeError, "my error")
+      }.should.raise(RuntimeError, "my error")
     end
 
     it "sets the thread's group" do
       thr = @t.rb_thread_create(-> x { }, nil)
       begin
         thread_group = thr.group
-        thread_group.should be_an_instance_of(ThreadGroup)
+        thread_group.should.instance_of?(ThreadGroup)
       ensure
         thr.join
       end
     end
   end
 
+  describe "ruby_native_thread_p" do
+    it "returns non-zero for a ruby thread" do
+      @t.ruby_native_thread_p.should == true
+    end
+
+    it "returns zero for a non ruby thread" do
+      @t.ruby_native_thread_p_new_thread.should == false
+    end
+  end
+
   describe "rb_thread_call_without_gvl" do
     it "runs a C function with the global lock unlocked and can be woken by Thread#wakeup" do
       thr = Thread.new do
@@ -118,7 +128,7 @@ describe "C-API Thread function" do
       thr.wakeup
 
       # Make sure it stopped and we got a proper value
-      thr.value.should be_true
+      thr.value.should == true
     end
 
     platform_is_not :windows do
@@ -149,30 +159,36 @@ describe "C-API Thread function" do
 
         going_to_block = true
         # Make sure it stopped and we got a proper value
-        @t.rb_thread_call_without_gvl.should be_true
+        @t.rb_thread_call_without_gvl.should == true
 
         interrupter.join
       end
     end
 
-    platform_is_not :mingw do
-      it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do
-        thr = Thread.new do
-          @t.rb_thread_call_without_gvl_with_ubf_io
-        end
+    it "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" do
+      thr = Thread.new do
+        @t.rb_thread_call_without_gvl_with_ubf_io
+      end
+
+      # Wait until it's blocking...
+      Thread.pass until thr.stop?
 
-        # Wait until it's blocking...
-        Thread.pass until thr.stop?
+      # The thread status is set to sleep by rb_thread_call_without_gvl(),
+      # but the thread might not be in the blocking read(2) yet, so wait a bit.
+      sleep 0.1
 
-        # The thread status is set to sleep by rb_thread_call_without_gvl(),
-        # but the thread might not be in the blocking read(2) yet, so wait a bit.
-        sleep 0.1
+      # Wake it up, causing the unblock function to be run.
+      thr.wakeup
 
-        # Wake it up, causing the unblock function to be run.
-        thr.wakeup
+      # Make sure it stopped and we got a proper value
+      thr.value.should == true
+    end
+  end
 
-        # Make sure it stopped and we got a proper value
-        thr.value.should be_true
+  ruby_version_is "4.0" do
+    describe "ruby_thread_has_gvl_p" do
+      it "returns true if the current thread has the GVL" do
+        @t.ruby_thread_has_gvl_p.should == true
       end
     end
   end