[llvm] [lit] Fix lit hang on pool join when exception is thrown (PR #131881)

[David Garcia Orozco via llvm-commits]

https://github.com/ayylol updated https://github.com/llvm/llvm-project/pull/131881

>From 7851d95c356be62edd3b1286c78f3ad2efc24ecc Mon Sep 17 00:00:00 2001
From: "Garcia Orozco, David" <david.garcia.orozco at intel.com>
Date: Tue, 18 Mar 2025 07:12:19 -0700
Subject: [PATCH] Fix lit hang

---
 llvm/utils/lit/lit/TestRunner.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
index 00432b8d31778..471c76b732e62 100644
--- a/llvm/utils/lit/lit/TestRunner.py
+++ b/llvm/utils/lit/lit/TestRunner.py
@@ -201,7 +201,12 @@ def executeShCmd(cmd, shenv, results, timeout=0):
     timeoutHelper = TimeoutHelper(timeout)
     if timeout > 0:
         timeoutHelper.startTimer()
-    finalExitCode = _executeShCmd(cmd, shenv, results, timeoutHelper)
+    try:
+        finalExitCode = _executeShCmd(cmd, shenv, results, timeoutHelper)
+    except InternalShellError:
+        e = sys.exc_info()[1]
+        finalExitCode = 127
+        results.append(ShellCommandResult(e.command, "", e.message, finalExitCode, False))
     timeoutHelper.cancel()
     timeoutInfo = None
     if timeoutHelper.timeoutReached():
@@ -1105,15 +1110,10 @@ def executeScriptInternal(
 
     results = []
     timeoutInfo = None
-    try:
-        shenv = ShellEnvironment(cwd, test.config.environment)
-        exitCode, timeoutInfo = executeShCmd(
+    shenv = ShellEnvironment(cwd, test.config.environment)
+    exitCode, timeoutInfo = executeShCmd(
             cmd, shenv, results, timeout=litConfig.maxIndividualTestTime
-        )
-    except InternalShellError:
-        e = sys.exc_info()[1]
-        exitCode = 127
-        results.append(ShellCommandResult(e.command, "", e.message, exitCode, False))
+            )
 
     out = err = ""
     for i, result in enumerate(results):