https://github.com/DrSergei updated
https://github.com/llvm/llvm-project/pull/145231
>From f0b48bffc61c8f2b1c52d3f26b8a8b210a3756f7 Mon Sep 17 00:00:00 2001
From: Druzhkov Sergei <serzhdruz...@gmail.com>
Date: Thu, 19 Jun 2025 15:50:27 +0300
Subject: [PATCH] [lldb-dap] Fix flaky test
---
lldb/test/API/tools/lldb-dap/server/TestDAP_server.py | 3 ++-
lldb/tools/lldb-dap/tool/lldb-dap.cpp | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
index ed17044a220d4..116bc53a2dde0 100644
--- a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
+++ b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
@@ -101,7 +101,8 @@ def test_server_interrupt(self):
# Interrupt the server which should disconnect all clients.
process.send_signal(signal.SIGINT)
- self.dap_server.wait_for_terminated()
+ self.dap_server.wait_for_event(["terminated", "exited"])
+ self.dap_server.wait_for_event(["terminated", "exited"])
self.assertIsNotNone(
self.dap_server.exit_status,
"Process exited before interrupting lldb-dap server",
diff --git a/lldb/tools/lldb-dap/tool/lldb-dap.cpp
b/lldb/tools/lldb-dap/tool/lldb-dap.cpp
index 9b9de5e21a742..af7080845239b 100644
--- a/lldb/tools/lldb-dap/tool/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/tool/lldb-dap.cpp
@@ -342,8 +342,6 @@ serveConnection(const Socket::SocketProtocol &protocol,
const std::string &name,
<< " disconnected failed: "
<< llvm::toString(std::move(error)) << "\n";
}
- // Close the socket to ensure the DAP::Loop read finishes.
- sock->Close();
}
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
