From 967ae6278f8429dc268f8d3252de048eba86fe29 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Sun, 10 May 2020 00:52:54 -0700
Subject: [PATCH] Run rb_syswait on exec failure

not only when !w but also when w == WAITPID_LOCK_ONLY.
See also: f7c0cc36920a4ed14a3ab1ca6cfdf18ceff1e5d5 and a2264342063260d660b99872eaf5080f6ab08e81.
We thought this change was an oversight in the latter commit.

Without this change, the test fails like:

$ make test-all TESTS="../test/ruby/test_process.rb -n test_exec_failure_leaves_no_child" RUN_OPTS="--jit"
...
  1) Failure:
TestProcess#test_exec_failure_leaves_no_child [/home/k0kubun/src/github.com/ruby/ruby/test/ruby/test_process.rb:2493]:
Expected [[26799, #<Process::Status: pid 26799 exit 127>]] to be empty.

Co-Authored-By: Yusuke Endoh <mame@ruby-lang.org>
---
 process.c                                   | 2 +-
 test/ruby/test_process.rb                   | 7 +++++++
 test/rubygems/test_gem_ext_cmake_builder.rb | 8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/process.c b/process.c
index e5cfed8cf2..7ec3b54336 100644
--- a/process.c
+++ b/process.c
@@ -4046,7 +4046,7 @@ fork_check_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
                       "only used by extensions");
             rb_protect(proc_syswait, (VALUE)pid, status);
         }
-        else if (!w) {
+        else if (!w || w == WAITPID_LOCK_ONLY) {
             rb_syswait(pid);
         }
         errno = err;
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 7bcfa48f4f..9d0ee6708a 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -2485,4 +2485,11 @@ EOS
     Process.wait spawn(RUBY, "-e", "exit 13")
     assert_same(Process.last_status, $?)
   end
+
+  def test_exec_failure_leaves_no_child
+    assert_raise(Errno::ENOENT) do
+      spawn('inexistent_command')
+    end
+    assert_empty(Process.waitall)
+  end
 end
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index d056202cc0..b3f9241a96 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -14,14 +14,6 @@ class TestGemExtCmakeBuilder < Gem::TestCase
       _, status = Open3.capture2e('cmake')
       skip 'cmake not present' unless status.success?
     rescue Errno::ENOENT
-      # Open3.capture2e with ENOENT with JIT enabled leaves a zombie process.
-      # TODO: avoid making the zombie on ENOENT with JIT
-      if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-        begin
-          Process.waitall
-        rescue Errno::ECHILD
-        end
-      end
       skip 'cmake not present'
     end