19 files changed, 270 insertions, 138 deletions

diff --git a/spec/ruby/core/process/_fork_spec.rb b/spec/ruby/core/process/_fork_spec.rb
index 6f711ad2dd..e1f45e2656 100644
--- a/spec/ruby/core/process/_fork_spec.rb
+++ b/spec/ruby/core/process/_fork_spec.rb
@@ -1,24 +1,24 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.1" do
-  describe "Process._fork" do
-    it "for #respond_to? returns the same as Process.respond_to?(:fork)" do
-      Process.respond_to?(:_fork).should == Process.respond_to?(:fork)
-    end
+describe "Process._fork" do
+  it "for #respond_to? returns the same as Process.respond_to?(:fork)" do
+    Process.respond_to?(:_fork).should == Process.respond_to?(:fork)
+  end
 
-    guard_not -> { Process.respond_to?(:fork) } do
-      it "raises a NotImplementedError when called" do
-        -> { Process._fork }.should raise_error(NotImplementedError)
-      end
+  # Using respond_to? in a guard here is OK because the correct semantics
+  # are that _fork is implemented if and only if fork is (see above).
+  guard_not -> { Process.respond_to?(:fork) } do
+    it "raises a NotImplementedError when called" do
+      -> { Process._fork }.should raise_error(NotImplementedError)
     end
+  end
 
-    guard -> { Process.respond_to?(:fork) } do
-      it "is called by Process#fork" do
-        Process.should_receive(:_fork).once.and_return(42)
+  guard -> { Process.respond_to?(:fork) } do
+    it "is called by Process#fork" do
+      Process.should_receive(:_fork).once.and_return(42)
 
-        pid = Process.fork {}
-        pid.should equal(42)
-      end
+      pid = Process.fork {}
+      pid.should equal(42)
     end
   end
 end
diff --git a/spec/ruby/core/process/argv0_spec.rb b/spec/ruby/core/process/argv0_spec.rb
index 7c2342f959..f5aba719e9 100644
--- a/spec/ruby/core/process/argv0_spec.rb
+++ b/spec/ruby/core/process/argv0_spec.rb
@@ -8,7 +8,7 @@ describe "Process.argv0" do
   it "is the path given as the main script and the same as __FILE__" do
     script = "fixtures/argv0.rb"
 
-    Dir.chdir(File.dirname(__FILE__)) do
+    Dir.chdir(__dir__) do
       ruby_exe(script).should == "#{script}\n#{script}\nOK"
     end
   end
diff --git a/spec/ruby/core/process/constants_spec.rb b/spec/ruby/core/process/constants_spec.rb
index 4130bb58a5..57cacadef2 100644
--- a/spec/ruby/core/process/constants_spec.rb
+++ b/spec/ruby/core/process/constants_spec.rb
@@ -2,63 +2,91 @@ require_relative '../../spec_helper'
 
 describe "Process::Constants" do
   platform_is :darwin, :netbsd, :freebsd do
-    it "has the correct constant values on BSD-like systems" do
-      Process::WNOHANG.should == 1
-      Process::WUNTRACED.should == 2
-      Process::PRIO_PROCESS.should == 0
-      Process::PRIO_PGRP.should == 1
-      Process::PRIO_USER.should == 2
-      Process::RLIM_INFINITY.should == 9223372036854775807
-      Process::RLIMIT_CPU.should == 0
-      Process::RLIMIT_FSIZE.should == 1
-      Process::RLIMIT_DATA.should == 2
-      Process::RLIMIT_STACK.should == 3
-      Process::RLIMIT_CORE.should == 4
-      Process::RLIMIT_RSS.should == 5
-      Process::RLIMIT_MEMLOCK.should == 6
-      Process::RLIMIT_NPROC.should == 7
-      Process::RLIMIT_NOFILE.should == 8
+    it "are all present on BSD-like systems" do
+      %i[
+          WNOHANG
+          WUNTRACED
+          PRIO_PROCESS
+          PRIO_PGRP
+          PRIO_USER
+          RLIM_INFINITY
+          RLIMIT_CPU
+          RLIMIT_FSIZE
+          RLIMIT_DATA
+          RLIMIT_STACK
+          RLIMIT_CORE
+          RLIMIT_RSS
+          RLIMIT_MEMLOCK
+          RLIMIT_NPROC
+          RLIMIT_NOFILE
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :darwin do
-    it "has the correct constant values on Darwin" do
-      Process::RLIM_SAVED_MAX.should == 9223372036854775807
-      Process::RLIM_SAVED_CUR.should == 9223372036854775807
-      Process::RLIMIT_AS.should == 5
+    it "are all present on Darwin" do
+      %i[
+        RLIM_SAVED_MAX
+        RLIM_SAVED_CUR
+        RLIMIT_AS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :linux do
-    it "has the correct constant values on Linux" do
-      Process::WNOHANG.should == 1
-      Process::WUNTRACED.should == 2
-      Process::PRIO_PROCESS.should == 0
-      Process::PRIO_PGRP.should == 1
-      Process::PRIO_USER.should == 2
-      Process::RLIMIT_CPU.should == 0
-      Process::RLIMIT_FSIZE.should == 1
-      Process::RLIMIT_DATA.should == 2
-      Process::RLIMIT_STACK.should == 3
-      Process::RLIMIT_CORE.should == 4
-      Process::RLIMIT_RSS.should == 5
-      Process::RLIMIT_NPROC.should == 6
-      Process::RLIMIT_NOFILE.should == 7
-      Process::RLIMIT_MEMLOCK.should == 8
-      Process::RLIMIT_AS.should == 9
-
-      # These values appear to change according to the platform.
-      values = [4294967295, 9223372036854775807, 18446744073709551615]
-      values.include?(Process::RLIM_INFINITY).should be_true
-      values.include?(Process::RLIM_SAVED_MAX).should be_true
-      values.include?(Process::RLIM_SAVED_CUR).should be_true
+    it "are all present on Linux" do
+      %i[
+        WNOHANG
+        WUNTRACED
+        PRIO_PROCESS
+        PRIO_PGRP
+        PRIO_USER
+        RLIMIT_CPU
+        RLIMIT_FSIZE
+        RLIMIT_DATA
+        RLIMIT_STACK
+        RLIMIT_CORE
+        RLIMIT_RSS
+        RLIMIT_NPROC
+        RLIMIT_NOFILE
+        RLIMIT_MEMLOCK
+        RLIMIT_AS
+        RLIM_INFINITY
+        RLIM_SAVED_MAX
+        RLIM_SAVED_CUR
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
   platform_is :netbsd, :freebsd do
-    it "Process::RLIMIT_SBSIZE" do
-      Process::RLIMIT_SBSIZE.should == 9 # FIXME: what's it equal?
-      Process::RLIMIT_AS.should == 10
+    it "are all present on NetBSD and FreeBSD" do
+      %i[
+        RLIMIT_SBSIZE
+        RLIMIT_AS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
+    end
+  end
+
+  platform_is :freebsd do
+    it "are all present on FreeBSD" do
+      %i[
+        RLIMIT_NPTS
+      ].each do |const|
+        Process.const_defined?(const).should be_true
+        Process.const_get(const).should be_an_instance_of(Integer)
+      end
     end
   end
 
diff --git a/spec/ruby/core/process/daemon_spec.rb b/spec/ruby/core/process/daemon_spec.rb
index 70ffd1b320..20b0d743b9 100644
--- a/spec/ruby/core/process/daemon_spec.rb
+++ b/spec/ruby/core/process/daemon_spec.rb
@@ -2,6 +2,9 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/common'
 
 platform_is_not :windows do
+  # macOS 15 is not working this examples
+  return if /darwin/ =~ RUBY_PLATFORM && /15/ =~ `sw_vers -productVersion`
+
   describe :process_daemon_keep_stdio_open_false, shared: true do
     it "redirects stdout to /dev/null" do
       @daemon.invoke("keep_stdio_open_false_stdout", @object).should == ""
diff --git a/spec/ruby/core/process/exec_spec.rb b/spec/ruby/core/process/exec_spec.rb
index deb8913b6b..0f371b39c8 100644
--- a/spec/ruby/core/process/exec_spec.rb
+++ b/spec/ruby/core/process/exec_spec.rb
@@ -30,20 +30,20 @@ describe "Process.exec" do
   end
 
   it "raises Errno::EACCES when passed a directory" do
-    -> { Process.exec File.dirname(__FILE__) }.should raise_error(Errno::EACCES)
+    -> { Process.exec __dir__ }.should raise_error(Errno::EACCES)
   end
 
   it "runs the specified command, replacing current process" do
-    ruby_exe('Process.exec "echo hello"; puts "fail"', escape: true).should == "hello\n"
+    ruby_exe('Process.exec "echo hello"; puts "fail"').should == "hello\n"
   end
 
   it "sets the current directory when given the :chdir option" do
     tmpdir = tmp("")[0..-2]
     platform_is_not :windows do
-      ruby_exe("Process.exec(\"pwd\", chdir: #{tmpdir.inspect})", escape: true).should == "#{tmpdir}\n"
+      ruby_exe("Process.exec(\"pwd\", chdir: #{tmpdir.inspect})").should == "#{tmpdir}\n"
     end
     platform_is :windows do
-      ruby_exe("Process.exec(\"cd\", chdir: #{tmpdir.inspect})", escape: true).tr('\\', '/').should == "#{tmpdir}\n"
+      ruby_exe("Process.exec(\"cd\", chdir: #{tmpdir.inspect})").tr('\\', '/').should == "#{tmpdir}\n"
     end
   end
 
@@ -73,13 +73,13 @@ describe "Process.exec" do
     platform_is_not :windows do
       it "subjects the specified command to shell expansion" do
         result = Dir.chdir(@dir) do
-          ruby_exe('Process.exec "echo *"', escape: true)
+          ruby_exe('Process.exec "echo *"')
         end
         result.chomp.should == @name
       end
 
       it "creates an argument array with shell parsing semantics for whitespace" do
-        ruby_exe('Process.exec "echo a b  c   d"', escape: true).should == "a b c d\n"
+        ruby_exe('Process.exec "echo a b  c   d"').should == "a b c d\n"
       end
     end
 
@@ -87,13 +87,13 @@ describe "Process.exec" do
       # There is no shell expansion on Windows
       it "does not subject the specified command to shell expansion on Windows" do
         result = Dir.chdir(@dir) do
-          ruby_exe('Process.exec "echo *"', escape: true)
+          ruby_exe('Process.exec "echo *"')
         end
         result.should == "*\n"
       end
 
       it "does not create an argument array with shell parsing semantics for whitespace on Windows" do
-        ruby_exe('Process.exec "echo a b  c   d"', escape: true).should == "a b  c   d\n"
+        ruby_exe('Process.exec "echo a b  c   d"').should == "a b  c   d\n"
       end
     end
 
@@ -105,7 +105,7 @@ describe "Process.exec" do
       platform_is :windows do
         cmd = '"cmd.exe", "/C", "echo", "*"'
       end
-      ruby_exe("Process.exec #{cmd}", escape: true).should == "*\n"
+      ruby_exe("Process.exec #{cmd}").should == "*\n"
     end
   end
 
@@ -124,29 +124,29 @@ describe "Process.exec" do
     end
 
     it "sets environment variables in the child environment" do
-      ruby_exe('Process.exec({"FOO" => "BAR"}, "echo ' + var + '")', escape: true).should == "BAR\n"
+      ruby_exe('Process.exec({"FOO" => "BAR"}, "echo ' + var + '")').should == "BAR\n"
     end
 
     it "unsets environment variables whose value is nil" do
       platform_is_not :windows do
-        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")', escape: true).should == "\n"
+        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")').should == "\n"
       end
       platform_is :windows do
         # On Windows, echo-ing a non-existent env var is treated as echo-ing any other string of text
-        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")', escape: true).should == var + "\n"
+        ruby_exe('Process.exec({"FOO" => nil}, "echo ' + var + '")').should == var + "\n"
       end
     end
 
     it "coerces environment argument using to_hash" do
-      ruby_exe('o = Object.new; def o.to_hash; {"FOO" => "BAR"}; end; Process.exec(o, "echo ' + var + '")', escape: true).should == "BAR\n"
+      ruby_exe('o = Object.new; def o.to_hash; {"FOO" => "BAR"}; end; Process.exec(o, "echo ' + var + '")').should == "BAR\n"
     end
 
     it "unsets other environment variables when given a true :unsetenv_others option" do
       platform_is_not :windows do
-        ruby_exe('Process.exec("echo ' + var + '", unsetenv_others: true)', escape: true).should == "\n"
+        ruby_exe('Process.exec("echo ' + var + '", unsetenv_others: true)').should == "\n"
       end
       platform_is :windows do
-        ruby_exe('Process.exec("' + ENV['COMSPEC'].gsub('\\', '\\\\\\') + ' /C echo ' + var + '", unsetenv_others: true)', escape: true).should == var + "\n"
+        ruby_exe('Process.exec("' + ENV['COMSPEC'].gsub('\\', '\\\\\\') + ' /C echo ' + var + '", unsetenv_others: true)').should == var + "\n"
       end
     end
   end
@@ -154,19 +154,19 @@ describe "Process.exec" do
   describe "with a command array" do
     it "uses the first element as the command name and the second as the argv[0] value" do
       platform_is_not :windows do
-        ruby_exe('Process.exec(["/bin/sh", "argv_zero"], "-c", "echo $0")', escape: true).should == "argv_zero\n"
+        ruby_exe('Process.exec(["/bin/sh", "argv_zero"], "-c", "echo $0")').should == "argv_zero\n"
       end
       platform_is :windows do
-        ruby_exe('Process.exec(["cmd.exe", "/C"], "/C", "echo", "argv_zero")', escape: true).should == "argv_zero\n"
+        ruby_exe('Process.exec(["cmd.exe", "/C"], "/C", "echo", "argv_zero")').should == "argv_zero\n"
       end
     end
 
     it "coerces the argument using to_ary" do
       platform_is_not :windows do
-        ruby_exe('o = Object.new; def o.to_ary; ["/bin/sh", "argv_zero"]; end; Process.exec(o, "-c", "echo $0")', escape: true).should == "argv_zero\n"
+        ruby_exe('o = Object.new; def o.to_ary; ["/bin/sh", "argv_zero"]; end; Process.exec(o, "-c", "echo $0")').should == "argv_zero\n"
       end
       platform_is :windows do
-        ruby_exe('o = Object.new; def o.to_ary; ["cmd.exe", "/C"]; end; Process.exec(o, "/C", "echo", "argv_zero")', escape: true).should == "argv_zero\n"
+        ruby_exe('o = Object.new; def o.to_ary; ["cmd.exe", "/C"]; end; Process.exec(o, "/C", "echo", "argv_zero")').should == "argv_zero\n"
       end
     end
 
@@ -200,7 +200,7 @@ describe "Process.exec" do
             end
             EOC
 
-          ruby_exe(cmd, escape: true)
+          ruby_exe(cmd)
           child_fd = IO.read(@child_fd_file).to_i
           child_fd.to_i.should > STDERR.fileno
 
@@ -216,7 +216,7 @@ describe "Process.exec" do
             Process.exec("#{ruby_cmd(map_fd_fixture)} \#{f.fileno}", f.fileno => f.fileno)
             EOC
 
-          output = ruby_exe(cmd, escape: true)
+          output = ruby_exe(cmd)
           child_fd, close_on_exec = output.split
 
           child_fd.to_i.should > STDERR.fileno
@@ -232,7 +232,7 @@ describe "Process.exec" do
             puts(f.close_on_exec?)
             EOC
 
-          output = ruby_exe(cmd, escape: true)
+          output = ruby_exe(cmd)
           output.split.should == ['true', 'false']
         end
       end
diff --git a/spec/ruby/core/process/fixtures/clocks.rb b/spec/ruby/core/process/fixtures/clocks.rb
index f043f6ac1f..5757e280be 100644
--- a/spec/ruby/core/process/fixtures/clocks.rb
+++ b/spec/ruby/core/process/fixtures/clocks.rb
@@ -2,7 +2,7 @@ module ProcessSpecs
   def self.clock_constants
     clocks = []
 
-    platform_is_not :windows, :solaris do
+    platform_is_not :windows do
       clocks += Process.constants.select { |c| c.to_s.start_with?('CLOCK_') }
 
       # These require CAP_WAKE_ALARM and are not documented in
diff --git a/spec/ruby/core/process/fixtures/kill.rb b/spec/ruby/core/process/fixtures/kill.rb
index 0b88f8ee1f..b922a043f1 100644
--- a/spec/ruby/core/process/fixtures/kill.rb
+++ b/spec/ruby/core/process/fixtures/kill.rb
@@ -1,5 +1,3 @@
-require 'thread'
-
 pid_file = ARGV.shift
 scenario = ARGV.shift
 
diff --git a/spec/ruby/core/process/gid_spec.rb b/spec/ruby/core/process/gid_spec.rb
index 07221da420..ca935ed520 100644
--- a/spec/ruby/core/process/gid_spec.rb
+++ b/spec/ruby/core/process/gid_spec.rb
@@ -3,8 +3,8 @@ require_relative '../../spec_helper'
 describe "Process.gid" do
   platform_is_not :windows do
     it "returns the correct gid for the user executing this process" do
-       current_gid_according_to_unix = `id -gr`.to_i
-       Process.gid.should == current_gid_according_to_unix
+      current_gid_according_to_unix = `id -gr`.to_i
+      Process.gid.should == current_gid_according_to_unix
     end
   end
 
diff --git a/spec/ruby/core/process/setrlimit_spec.rb b/spec/ruby/core/process/setrlimit_spec.rb
index b92f98fd40..ba8d1e04ca 100644
--- a/spec/ruby/core/process/setrlimit_spec.rb
+++ b/spec/ruby/core/process/setrlimit_spec.rb
@@ -73,20 +73,18 @@ describe "Process.setrlimit" do
         Process.setrlimit(:STACK, *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
       end
 
-      platform_is_not :solaris, :aix do
+      platform_is_not :aix do
         it "coerces :MEMLOCK into RLIMIT_MEMLOCK" do
           Process.setrlimit(:MEMLOCK, *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
         end
       end
 
-      platform_is_not :solaris do
-        it "coerces :NPROC into RLIMIT_NPROC" do
-          Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
-        end
+      it "coerces :NPROC into RLIMIT_NPROC" do
+        Process.setrlimit(:NPROC, *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+      end
 
-        it "coerces :RSS into RLIMIT_RSS" do
-          Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
-        end
+      it "coerces :RSS into RLIMIT_RSS" do
+        Process.setrlimit(:RSS, *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
       end
 
       platform_is :netbsd, :freebsd do
@@ -155,20 +153,18 @@ describe "Process.setrlimit" do
         Process.setrlimit("STACK", *Process.getrlimit(Process::RLIMIT_STACK)).should be_nil
       end
 
-      platform_is_not :solaris, :aix do
+      platform_is_not :aix do
         it "coerces 'MEMLOCK' into RLIMIT_MEMLOCK" do
           Process.setrlimit("MEMLOCK", *Process.getrlimit(Process::RLIMIT_MEMLOCK)).should be_nil
         end
       end
 
-      platform_is_not :solaris do
-        it "coerces 'NPROC' into RLIMIT_NPROC" do
-          Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
-        end
+      it "coerces 'NPROC' into RLIMIT_NPROC" do
+        Process.setrlimit("NPROC", *Process.getrlimit(Process::RLIMIT_NPROC)).should be_nil
+      end
 
-        it "coerces 'RSS' into RLIMIT_RSS" do
-          Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
-        end
+      it "coerces 'RSS' into RLIMIT_RSS" do
+        Process.setrlimit("RSS", *Process.getrlimit(Process::RLIMIT_RSS)).should be_nil
       end
 
       platform_is :netbsd, :freebsd do
diff --git a/spec/ruby/core/process/spawn_spec.rb b/spec/ruby/core/process/spawn_spec.rb
index c8a58c4d04..283a7f033d 100644
--- a/spec/ruby/core/process/spawn_spec.rb
+++ b/spec/ruby/core/process/spawn_spec.rb
@@ -714,7 +714,7 @@ describe "Process.spawn" do
   end
 
   it "raises an Errno::EACCES or Errno::EISDIR when passed a directory" do
-    -> { Process.spawn File.dirname(__FILE__) }.should raise_error(SystemCallError) { |e|
+    -> { Process.spawn __dir__ }.should raise_error(SystemCallError) { |e|
       [Errno::EACCES, Errno::EISDIR].should include(e.class)
     }
   end
diff --git a/spec/ruby/core/process/status/bit_and_spec.rb b/spec/ruby/core/process/status/bit_and_spec.rb
index 97f768fdc1..a805364629 100644
--- a/spec/ruby/core/process/status/bit_and_spec.rb
+++ b/spec/ruby/core/process/status/bit_and_spec.rb
@@ -1,5 +1,38 @@
 require_relative '../../../spec_helper'
 
-describe "Process::Status#&" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is ""..."4.0" do
+
+  describe "Process::Status#&" do
+    it "returns a bitwise and of the integer status of an exited child" do
+      suppress_warning do
+        ruby_exe("exit(29)", exit_status: 29)
+        ($? & 0).should == 0
+        ($? & $?.to_i).should == $?.to_i
+
+        # Actual value is implementation specific
+        platform_is :linux do
+          # 29 == 0b11101
+          ($? & 0b1011100000000).should == 0b1010100000000
+        end
+      end
+    end
+
+    ruby_version_is "3.3"..."4.0" do
+      it "raises an ArgumentError if mask is negative" do
+        suppress_warning do
+          ruby_exe("exit(0)")
+          -> {
+            $? & -1
+          }.should raise_error(ArgumentError, 'negative mask value: -1')
+        end
+      end
+
+      it "shows a deprecation warning" do
+        ruby_exe("exit(0)")
+        -> {
+          $? & 0
+        }.should complain(/warning: Process::Status#& is deprecated and will be removed .*use other Process::Status predicates instead/)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/process/status/right_shift_spec.rb b/spec/ruby/core/process/status/right_shift_spec.rb
index e9dda437e8..355aaf4c95 100644
--- a/spec/ruby/core/process/status/right_shift_spec.rb
+++ b/spec/ruby/core/process/status/right_shift_spec.rb
@@ -1,5 +1,37 @@
 require_relative '../../../spec_helper'
 
-describe "Process::Status#>>" do
-  it "needs to be reviewed for spec completeness"
+ruby_version_is ""..."4.0" do
+
+  describe "Process::Status#>>" do
+    it "returns a right shift of the integer status of an exited child" do
+      suppress_warning do
+        ruby_exe("exit(29)", exit_status: 29)
+        ($? >> 0).should == $?.to_i
+        ($? >> 1).should == $?.to_i >> 1
+
+        # Actual value is implementation specific
+        platform_is :linux do
+          ($? >> 8).should == 29
+        end
+      end
+    end
+
+    ruby_version_is "3.3"..."4.0" do
+      it "raises an ArgumentError if shift value is negative" do
+        suppress_warning do
+          ruby_exe("exit(0)")
+          -> {
+            $? >> -1
+          }.should raise_error(ArgumentError, 'negative shift value: -1')
+        end
+      end
+
+      it "shows a deprecation warning" do
+        ruby_exe("exit(0)")
+        -> {
+          $? >> 0
+        }.should complain(/warning: Process::Status#>> is deprecated and will be removed .*use other Process::Status attributes instead/)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/core/process/status/termsig_spec.rb b/spec/ruby/core/process/status/termsig_spec.rb
index 5d286950f8..9a22dbea71 100644
--- a/spec/ruby/core/process/status/termsig_spec.rb
+++ b/spec/ruby/core/process/status/termsig_spec.rb
@@ -6,7 +6,7 @@ describe "Process::Status#termsig" do
       ruby_exe("exit(0)")
     end
 
-    it "returns true" do
+    it "returns nil" do
       $?.termsig.should be_nil
     end
   end
diff --git a/spec/ruby/core/process/times_spec.rb b/spec/ruby/core/process/times_spec.rb
index d2610f6415..d3bff2cda9 100644
--- a/spec/ruby/core/process/times_spec.rb
+++ b/spec/ruby/core/process/times_spec.rb
@@ -16,31 +16,4 @@ describe "Process.times" do
       Process.times.utime.should > user
     end
   end
-
-  # TODO: The precision of `getrusage` depends on platforms (OpenBSD
-  # seems not supporting under-milliseconds in fact); this example is
-  # very questionable as an example of Ruby, and it just repeats the
-  # guard condition.
-  guard -> do
-    1000.times.any? do
-      # If getrusage has precision beyond milliseconds, there will be
-      # very likely at least one non-zero microsecond results when
-      # repeating enough.
-      time = Process.clock_gettime(:GETRUSAGE_BASED_CLOCK_PROCESS_CPUTIME_ID)
-      not ('%.6f' % time).end_with?('000')
-    end
-  rescue Errno::EINVAL
-    false
-  end do
-    it "uses getrusage when available to improve precision beyond milliseconds" do
-      max = 10_000
-
-      found = (max * 100).times.find do
-        time = Process.times.utime
-        !('%.6f' % time).end_with?('000')
-      end
-
-      found.should_not == nil
-    end
-  end
 end
diff --git a/spec/ruby/core/process/tms/cstime_spec.rb b/spec/ruby/core/process/tms/cstime_spec.rb
new file mode 100644
index 0000000000..9c2d9e8632
--- /dev/null
+++ b/spec/ruby/core/process/tms/cstime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#cstime" do
+  it "returns cstime attribute" do
+    cstime = Object.new
+    Process::Tms.new(nil, nil, nil, cstime).cstime.should == cstime
+  end
+end
+
+describe "Process::Tms#cstime=" do
+  it "assigns a value to the cstime attribute" do
+    cstime = Object.new
+    tms = Process::Tms.new
+    tms.cstime = cstime
+    tms.cstime.should == cstime
+  end
+end
diff --git a/spec/ruby/core/process/tms/cutime_spec.rb b/spec/ruby/core/process/tms/cutime_spec.rb
new file mode 100644
index 0000000000..0ac3ff1964
--- /dev/null
+++ b/spec/ruby/core/process/tms/cutime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#cutime" do
+  it "returns cutime attribute" do
+    cutime = Object.new
+    Process::Tms.new(nil, nil, cutime, nil).cutime.should == cutime
+  end
+end
+
+describe "Process::Tms#cutime=" do
+  it "assigns a value to the cutime attribute" do
+    cutime = Object.new
+    tms = Process::Tms.new
+    tms.cutime = cutime
+    tms.cutime.should == cutime
+  end
+end
diff --git a/spec/ruby/core/process/tms/stime_spec.rb b/spec/ruby/core/process/tms/stime_spec.rb
new file mode 100644
index 0000000000..1e8371475f
--- /dev/null
+++ b/spec/ruby/core/process/tms/stime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#stime" do
+  it "returns stime attribute" do
+    stime = Object.new
+    Process::Tms.new(nil, stime, nil, nil).stime.should == stime
+  end
+end
+
+describe "Process::Tms#stime=" do
+  it "assigns a value to the stime attribute" do
+    stime = Object.new
+    tms = Process::Tms.new
+    tms.stime = stime
+    tms.stime.should == stime
+  end
+end
diff --git a/spec/ruby/core/process/tms/utime_spec.rb b/spec/ruby/core/process/tms/utime_spec.rb
new file mode 100644
index 0000000000..403a31e2e6
--- /dev/null
+++ b/spec/ruby/core/process/tms/utime_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../spec_helper'
+
+describe "Process::Tms#utime" do
+  it "returns utime attribute" do
+    utime = Object.new
+    Process::Tms.new(utime, nil, nil, nil).utime.should == utime
+  end
+end
+
+describe "Process::Tms#utime=" do
+  it "assigns a value to the ctime attribute" do
+    utime = Object.new
+    tms = Process::Tms.new
+    tms.utime = utime
+    tms.utime.should == utime
+  end
+end
diff --git a/spec/ruby/core/process/waitpid_spec.rb b/spec/ruby/core/process/waitpid_spec.rb
index f7cf1a45a8..a02147b663 100644
--- a/spec/ruby/core/process/waitpid_spec.rb
+++ b/spec/ruby/core/process/waitpid_spec.rb
@@ -2,7 +2,8 @@ require_relative '../../spec_helper'
 
 describe "Process.waitpid" do
   it "returns nil when the process has not yet completed and WNOHANG is specified" do
-    pid = spawn("sleep 5")
+    cmd = platform_is(:windows) ? "timeout" : "sleep"
+    pid = spawn("#{cmd} 5")
     begin
       Process.waitpid(pid, Process::WNOHANG).should == nil
       Process.kill("KILL", pid)