Revert "spec: skip Process wait specs on MJIT"

This reverts r63731 (commit 359dd59db2).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

spec/mspec/lib/mspec/guards/feature.rb

@@ -39,9 +39,3 @@ end
 def with_feature(*features, &block)
   FeatureGuard.new(*features).run_if(:with_feature, &block)
 end
-
-MSpecEnv.class_eval do
-  def without_feature(*features, &block)
-    FeatureGuard.new(*features).run_unless(:without_feature, &block)
-  end
-end

spec/ruby/core/process/wait2_spec.rb

@@ -14,21 +14,19 @@ describe "Process.wait2" do
     end
   end
 
-  without_feature :mjit do # [Bug #14867]
+  platform_is_not :windows do
-    platform_is_not :windows do
+    it "returns the pid and status of child process" do
-      it "returns the pid and status of child process" do
+      pidf = Process.fork { Process.exit! 99 }
-        pidf = Process.fork { Process.exit! 99 }
+      results = Process.wait2
-        results = Process.wait2
+      results.size.should == 2
-        results.size.should == 2
+      pidw, status = results
-        pidw, status = results
+      pidf.should == pidw
-        pidf.should == pidw
+      status.exitstatus.should == 99
-        status.exitstatus.should == 99
-      end
-    end
-
-    it "raises a StandardError if no child processes exist" do
-      lambda { Process.wait2 }.should raise_error(Errno::ECHILD)
-      lambda { Process.wait2 }.should raise_error(StandardError)
     end
   end
+
+  it "raises a StandardError if no child processes exist" do
+    lambda { Process.wait2 }.should raise_error(Errno::ECHILD)
+    lambda { Process.wait2 }.should raise_error(StandardError)
+  end
 end

spec/ruby/core/process/wait_spec.rb

@@ -12,81 +12,79 @@ describe "Process.wait" do
     end
   end
 
-  without_feature :mjit do # [Bug #14867]
+  it "raises an Errno::ECHILD if there are no child processes" do
-    it "raises an Errno::ECHILD if there are no child processes" do
+    lambda { Process.wait }.should raise_error(Errno::ECHILD)
-      lambda { Process.wait }.should raise_error(Errno::ECHILD)
+  end
+
+  platform_is_not :windows do
+    it "returns its childs pid" do
+      pid = Process.spawn(ruby_cmd('exit'))
+      Process.wait.should == pid
     end
 
-    platform_is_not :windows do
+    it "sets $? to a Process::Status" do
-      it "returns its childs pid" do
+      pid = Process.spawn(ruby_cmd('exit'))
-        pid = Process.spawn(ruby_cmd('exit'))
+      Process.wait
-        Process.wait.should == pid
+      $?.should be_kind_of(Process::Status)
-      end
+      $?.pid.should == pid
+    end
 
-      it "sets $? to a Process::Status" do
+    it "waits for any child process if no pid is given" do
-        pid = Process.spawn(ruby_cmd('exit'))
+      pid = Process.spawn(ruby_cmd('exit'))
-        Process.wait
+      Process.wait.should == pid
-        $?.should be_kind_of(Process::Status)
+      lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
-        $?.pid.should == pid
+    end
-      end
 
-      it "waits for any child process if no pid is given" do
+    it "waits for a specific child if a pid is given" do
-        pid = Process.spawn(ruby_cmd('exit'))
+      pid1 = Process.spawn(ruby_cmd('exit'))
-        Process.wait.should == pid
+      pid2 = Process.spawn(ruby_cmd('exit'))
-        lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      Process.wait(pid2).should == pid2
-      end
+      Process.wait(pid1).should == pid1
+      lambda { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
+      lambda { Process.kill(0, pid2) }.should raise_error(Errno::ESRCH)
+    end
 
-      it "waits for a specific child if a pid is given" do
+    it "coerces the pid to an Integer" do
-        pid1 = Process.spawn(ruby_cmd('exit'))
+      pid1 = Process.spawn(ruby_cmd('exit'))
-        pid2 = Process.spawn(ruby_cmd('exit'))
+      Process.wait(mock_int(pid1)).should == pid1
-        Process.wait(pid2).should == pid2
+      lambda { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
-        Process.wait(pid1).should == pid1
+    end
-        lambda { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
-        lambda { Process.kill(0, pid2) }.should raise_error(Errno::ESRCH)
-      end
 
-      it "coerces the pid to an Integer" do
+    # This spec is probably system-dependent.
-        pid1 = Process.spawn(ruby_cmd('exit'))
+    it "waits for a child whose process group ID is that of the calling process" do
-        Process.wait(mock_int(pid1)).should == pid1
+      pid1 = Process.spawn(ruby_cmd('exit'), pgroup: true)
-        lambda { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
+      pid2 = Process.spawn(ruby_cmd('exit'))
-      end
 
-      # This spec is probably system-dependent.
+      Process.wait(0).should == pid2
-      it "waits for a child whose process group ID is that of the calling process" do
+      Process.wait.should == pid1
-        pid1 = Process.spawn(ruby_cmd('exit'), pgroup: true)
+    end
-        pid2 = Process.spawn(ruby_cmd('exit'))
 
-        Process.wait(0).should == pid2
+    # This spec is probably system-dependent.
-        Process.wait.should == pid1
+    it "doesn't block if no child is available when WNOHANG is used" do
-      end
+      read, write = IO.pipe
-
+      pid = Process.fork do
-      # This spec is probably system-dependent.
-      it "doesn't block if no child is available when WNOHANG is used" do
-        read, write = IO.pipe
-        pid = Process.fork do
-          read.close
-          Signal.trap("TERM") { Process.exit! }
-          write << 1
-          write.close
-          sleep
-        end
-
-        Process.wait(pid, Process::WNOHANG).should be_nil
-
-        # wait for the child to setup its TERM handler
-        write.close
-        read.read(1)
         read.close
-
+        Signal.trap("TERM") { Process.exit! }
-        Process.kill("TERM", pid)
+        write << 1
-        Process.wait.should == pid
+        write.close
+        sleep
       end
 
-      it "always accepts flags=0" do
+      Process.wait(pid, Process::WNOHANG).should be_nil
-        pid = Process.spawn(ruby_cmd('exit'))
+
-        Process.wait(-1, 0).should == pid
+      # wait for the child to setup its TERM handler
-        lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      write.close
-      end
+      read.read(1)
+      read.close
+
+      Process.kill("TERM", pid)
+      Process.wait.should == pid
+    end
+
+    it "always accepts flags=0" do
+      pid = Process.spawn(ruby_cmd('exit'))
+      Process.wait(-1, 0).should == pid
+      lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
     end
   end
 end

spec/ruby/core/process/waitall_spec.rb

@@ -8,43 +8,41 @@ describe "Process.waitall" do
     end
   end
 
-  without_feature :mjit do # [Bug #14867]
+  it "returns an empty array when there are no children" do
-    it "returns an empty array when there are no children" do
+    Process.waitall.should == []
-      Process.waitall.should == []
+  end
+
+  it "takes no arguments" do
+    lambda { Process.waitall(0) }.should raise_error(ArgumentError)
+  end
+
+  platform_is_not :windows do
+    it "waits for all children" do
+      pids = []
+      pids << Process.fork { Process.exit! 2 }
+      pids << Process.fork { Process.exit! 1 }
+      pids << Process.fork { Process.exit! 0 }
+      Process.waitall
+      pids.each { |pid|
+        lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      }
     end
 
-    it "takes no arguments" do
+    it "returns an array of pid/status pairs" do
-      lambda { Process.waitall(0) }.should raise_error(ArgumentError)
+      pids = []
-    end
+      pids << Process.fork { Process.exit! 2 }
-
+      pids << Process.fork { Process.exit! 1 }
-    platform_is_not :windows do
+      pids << Process.fork { Process.exit! 0 }
-      it "waits for all children" do
+      a = Process.waitall
-        pids = []
+      a.should be_kind_of(Array)
-        pids << Process.fork { Process.exit! 2 }
+      a.size.should == 3
-        pids << Process.fork { Process.exit! 1 }
+      pids.each { |pid|
-        pids << Process.fork { Process.exit! 0 }
+        pid_status = a.assoc(pid)
-        Process.waitall
+        pid_status.should be_kind_of(Array)
-        pids.each { |pid|
+        pid_status.size.should == 2
-          lambda { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+        pid_status.first.should == pid
-        }
+        pid_status.last.should be_kind_of(Process::Status)
-      end
+      }
-
-      it "returns an array of pid/status pairs" do
-        pids = []
-        pids << Process.fork { Process.exit! 2 }
-        pids << Process.fork { Process.exit! 1 }
-        pids << Process.fork { Process.exit! 0 }
-        a = Process.waitall
-        a.should be_kind_of(Array)
-        a.size.should == 3
-        pids.each { |pid|
-          pid_status = a.assoc(pid)
-          pid_status.should be_kind_of(Array)
-          pid_status.size.should == 2
-          pid_status.first.should == pid
-          pid_status.last.should be_kind_of(Process::Status)
-        }
-      end
     end
   end
 end