https://github.com/mbucko updated
https://github.com/llvm/llvm-project/pull/90223
>From c699eff1500a431225d4b292a51a467bd2c74e5d Mon Sep 17 00:00:00 2001
From: Miro Bucko <mbu...@meta.com>
Date: Fri, 26 Apr 2024 08:17:26 -0700
Subject: [PATCH] [lldb-dap] Fix test_exit_status_message_sigterm test.
Summary:
'test_exit_status_message_sigterm' is failing due to 'psutil' dependency
introduced in PR #89405. This fix removes 'deque' dependency and checks if
'psutil' can be imported before running the test. If 'psutil' cannot be
imported, it emits a warning and skips the test.
Test Plan:
./bin/llvm-lit -sv
/path-to-llvm-project/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
--filter=tools/lldb-dap/console/TestDAP_console.py
Reviewers:
@jeffreytan81,@clayborg,@kusmour, @JDevlieghere,@walter-erquinigo
Subscribers:
Tasks:
lldb-dap
Tags:
---
.../tools/lldb-dap/console/TestDAP_console.py | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
b/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
index 8f456aaf890c7f..8769f39633e62f 100644
--- a/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
+++ b/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
@@ -4,17 +4,15 @@
import dap_server
import lldbdap_testcase
-import psutil
-from collections import deque
from lldbsuite.test import lldbutil
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
-def get_subprocess(process_name):
- queue = deque([psutil.Process(os.getpid())])
+def get_subprocess(root_process, process_name):
+ queue = [root_process]
while queue:
- process = queue.popleft()
+ process = queue.pop()
if process.name() == process_name:
return process
queue.extend(process.children())
@@ -131,7 +129,17 @@ def test_exit_status_message_sigterm(self):
process_name = (
"debugserver" if platform.system() in ["Darwin"] else "lldb-server"
)
- process = get_subprocess(process_name)
+
+ try:
+ import psutil
+ except ImportError:
+ print(
+ "psutil not installed, please install using 'pip install
psutil'. "
+ "Skipping test_exit_status_message_sigterm test.",
+ file=sys.stderr,
+ )
+ return
+ process = get_subprocess(psutil.Process(os.getpid()), process_name)
process.terminate()
process.wait()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
