From eb2b7fca437ceea90a391729419e211b1d5a7ea8 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 3 Jun 2020 17:23:04 +0900
Subject: [PATCH] Fixed up 56ca006784d

Run lldb just before sending ABRT or KILL signal.  Some tests
terminate child processes by TERM signal intentionally.
---
 tool/lib/envutil.rb | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb
index fb9d1fa23a..0bd8bdbc2c 100644
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
@@ -87,14 +87,19 @@ module EnvUtil
       pgroup = pid
     end
 
-    if /darwin/ =~ RUBY_PLATFORM
-      # sudo -n: --non-interactive
-      # lldb -p: attach
-      #      -o: run command
-      puts `sudo -n lldb -p #{pid} --batch -o "bt all" -o "call rb_vmdebug_stack_dump_all_threads()" -o quit`
-    end
+    lldb = true if /darwin/ =~ RUBY_PLATFORM
 
     while signal = signals.shift
+
+      if lldb and [:ABRT, :KILL].include?(signal)
+        lldb = false
+        # sudo -n: --non-interactive
+        # lldb -p: attach
+        #      -o: run command
+        system(*%W[sudo -n lldb -p #{pid} --batch -o bt\ all -o call\ rb_vmdebug_stack_dump_all_threads() -o quit])
+        true
+      end
+
       begin
         Process.kill signal, pgroup
       rescue Errno::EINVAL
@@ -108,6 +113,8 @@ module EnvUtil
         begin
           Timeout.timeout(reprieve) {Process.wait(pid)}
         rescue Timeout::Error
+        else
+          break
         end
       end
     end