Update to ruby/spec@7de852d

6 files changed, 33 insertions, 111 deletions

diff --git a/spec/ruby/core/process/euid_spec.rb b/spec/ruby/core/process/euid_spec.rb
index bc3f52592e..ffb71a7178 100644
--- a/spec/ruby/core/process/euid_spec.rb
+++ b/spec/ruby/core/process/euid_spec.rb
@@ -33,25 +33,12 @@ describe "Process.euid=" do
 
     as_superuser do
       describe "if run by a superuser" do
-        with_feature :fork do
-          it "sets the effective user id for the current process if run by a superuser" do
-            read, write = IO.pipe
-            pid = Process.fork do
-              begin
-                read.close
-                Process.euid = 1
-                write << Process.euid
-                write.close
-              rescue Exception => e
-                write << e << e.backtrace
-              end
-              Process.exit!
-            end
-            write.close
-            euid = read.gets
-            euid.should == "1"
-            Process.wait pid
-          end
+        it "sets the effective user id for the current process if run by a superuser" do
+          code = <<-RUBY
+            Process.euid = 1
+            puts Process.euid
+          RUBY
+          ruby_exe(code).should == "1\n"
         end
       end
     end
diff --git a/spec/ruby/core/process/ppid_spec.rb b/spec/ruby/core/process/ppid_spec.rb
index e0bdfef30b..7d22755c77 100644
--- a/spec/ruby/core/process/ppid_spec.rb
+++ b/spec/ruby/core/process/ppid_spec.rb
@@ -1,23 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Process.ppid" do
-  with_feature :fork do
-    it "returns the process id of the parent of this process" do
-
-      read, write = IO.pipe
-
-      child_pid = Process.fork {
-        read.close
-        write << "#{Process.ppid}\n"
-        write.close
-        exit!
-      }
-
-      write.close
-      pid = read.gets
-      read.close
-      Process.wait(child_pid)
-      pid.to_i.should == Process.pid
-    end
+  it "returns the process id of the parent of this process" do
+    ruby_exe("puts Process.ppid").should == "#{Process.pid}\n"
   end
 end
diff --git a/spec/ruby/core/process/setpgid_spec.rb b/spec/ruby/core/process/setpgid_spec.rb
index 992fbc3f4d..be724e9007 100644
--- a/spec/ruby/core/process/setpgid_spec.rb
+++ b/spec/ruby/core/process/setpgid_spec.rb
@@ -1,7 +1,8 @@
 require_relative '../../spec_helper'
 
 describe "Process.setpgid" do
-  with_feature :fork do
+  platform_is_not :windows do
+    # Must use fork as setpgid(2) gives EACCESS after execve()
     it "sets the process group id of the specified process" do
       rd, wr = IO.pipe
 
diff --git a/spec/ruby/core/process/setsid_spec.rb b/spec/ruby/core/process/setsid_spec.rb
index d00508a1f7..c83f912066 100644
--- a/spec/ruby/core/process/setsid_spec.rb
+++ b/spec/ruby/core/process/setsid_spec.rb
@@ -1,37 +1,16 @@
 require_relative '../../spec_helper'
 
 describe "Process.setsid" do
-  with_feature :fork do
+  platform_is_not :windows do
     it "establishes this process as a new session and process group leader" do
-      read, write = IO.pipe
-      read2, write2 = IO.pipe
-      pid = Process.fork {
-        begin
-          read.close
-          write2.close
-          pgid = Process.setsid
-          write << pgid
-          write.close
-          read2.gets
-        rescue Exception => e
-          write << e << e.backtrace
-        end
-        Process.exit!
-      }
-      write.close
-      read2.close
-      pgid_child = Integer(read.gets)
-      read.close
-      platform_is_not :aix, :openbsd do
-        # AIX does not allow Process.getsid(pid)
-        # if pid is in a different session.
-        pgid = Process.getsid(pid)
-        pgid_child.should == pgid
-      end
-      write2.close
-      Process.wait pid
+      sid = Process.getsid
 
-      pgid_child.should_not == Process.getsid
+      out = ruby_exe("p Process.getsid; p Process.setsid; p Process.getsid").lines
+      out[0].should == "#{sid}\n"
+      out[1].should == out[2]
+      out[2].should_not == "#{sid}\n"
+
+      sid.should == Process.getsid
     end
   end
 end
diff --git a/spec/ruby/core/process/uid_spec.rb b/spec/ruby/core/process/uid_spec.rb
index 4a66beaa2a..350779aff3 100644
--- a/spec/ruby/core/process/uid_spec.rb
+++ b/spec/ruby/core/process/uid_spec.rb
@@ -18,7 +18,6 @@ describe "Process.uid" do
 end
 
 describe "Process.uid=" do
-
   platform_is_not :windows do
     it "raises TypeError if not passed an Integer" do
       lambda { Process.uid = Object.new }.should raise_error(TypeError)
@@ -36,49 +35,23 @@ describe "Process.uid=" do
 
     as_superuser do
       describe "if run by a superuser" do
-        with_feature :fork do
-          it "sets the real user id for the current process" do
-            read, write = IO.pipe
-            pid = Process.fork do
-              begin
-                read.close
-                Process.uid = 1
-                write << Process.uid
-                write.close
-              rescue Exception => e
-                write << e << e.backtrace
-              end
-              Process.exit!
-            end
-            write.close
-            uid = read.gets
-            uid.should == "1"
-            Process.wait pid
-          end
+        it "sets the real user id for the current process" do
+          code = <<-RUBY
+            Process.uid = 1
+            puts Process.uid
+          RUBY
+          ruby_exe(code).should == "1\n"
+        end
 
-          it "sets the real user id if preceded by Process.euid=id" do
-            read, write = IO.pipe
-            pid = Process.fork do
-              begin
-                read.close
-                Process.euid = 1
-                Process.uid = 1
-                write << Process.uid
-                write.close
-              rescue Exception => e
-                write << e << e.backtrace
-              end
-              Process.exit!
-            end
-            write.close
-            uid = read.gets
-            uid.should == "1"
-            Process.wait pid
-          end
+        it "sets the real user id if preceded by Process.euid=id" do
+          code = <<-RUBY
+            Process.euid = 1
+            Process.uid = 1
+            puts Process.uid
+          RUBY
+          ruby_exe(code).should == "1\n"
         end
       end
     end
   end
-
-  it "needs to be reviewed for spec completeness"
 end
diff --git a/spec/ruby/core/process/wait2_spec.rb b/spec/ruby/core/process/wait2_spec.rb
index 18bf4be432..4b6491ccd2 100644
--- a/spec/ruby/core/process/wait2_spec.rb
+++ b/spec/ruby/core/process/wait2_spec.rb
@@ -8,9 +8,7 @@ describe "Process.wait2" do
     # but we shouldn't reap them from Ruby-space
     begin
       Process.wait(-1, Process::WNOHANG)
-      without_feature :mjit do
-        $stderr.puts "Leaked process before wait2 specs! Waiting for it"
-      end
+      $stderr.puts "Leaked process before wait2 specs! Waiting for it"
       leaked = Process.waitall
       $stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
       # Ruby-space should not see PIDs used by mjit