Author: Pavel Labath Date: 2025-04-22T15:35:53+02:00 New Revision: 616e8cc1fa0319819aa6978af0af9a3e4896103a
URL: https://github.com/llvm/llvm-project/commit/616e8cc1fa0319819aa6978af0af9a3e4896103a DIFF: https://github.com/llvm/llvm-project/commit/616e8cc1fa0319819aa6978af0af9a3e4896103a.diff LOG: Revert "[lldb] Use correct path for debugserver (#131609)" This reverts commit a86f4ee774e6d2eb9f38502ddda65842179a246a and the fixup in 587206a442ebb656f9d72e7e0cc5845ef3a2f7ed because brakage on macos (TestAutoInstallMainExecutable.py). Added: Modified: lldb/test/API/commands/platform/launchgdbserver/TestPlatformLaunchGDBServer.py lldb/tools/lldb-server/SystemInitializerLLGS.h Removed: ################################################################################ diff --git a/lldb/test/API/commands/platform/launchgdbserver/TestPlatformLaunchGDBServer.py b/lldb/test/API/commands/platform/launchgdbserver/TestPlatformLaunchGDBServer.py index 584879d3e723a..c365bc993e338 100644 --- a/lldb/test/API/commands/platform/launchgdbserver/TestPlatformLaunchGDBServer.py +++ b/lldb/test/API/commands/platform/launchgdbserver/TestPlatformLaunchGDBServer.py @@ -58,45 +58,3 @@ def test_platform_process_launch_gdb_server(self): self.runCmd("target create {}".format(self.getBuildArtifact("a.out"))) self.expect("run", substrs=["unable to launch a GDB server on"], error=True) - - @skipIfRemote - @skipUnlessPlatform(["linux"]) - @add_test_categories(["lldb-server"]) - def test_lldb_server_weird_symlinks(self): - self.build() - - hostname = socket.getaddrinfo("localhost", 0, proto=socket.IPPROTO_TCP)[0][4][0] - listen_url = "[%s]:0" % hostname - - port_file = self.getBuildArtifact("port") - commandline_args = [ - "platform", - "--listen", - listen_url, - "--socket-file", - port_file, - ] - - # Run lldb-server from a symlink without any binary called "lldb-server" in the directory. - new_lldb_server = self.getBuildArtifact( - "lldb-server-with-an-unconventional-name" - ) - os.symlink(lldbgdbserverutils.get_lldb_server_exe(), new_lldb_server) - - proc = self.spawnSubprocess(new_lldb_server, commandline_args) - socket_id = lldbutil.wait_for_file_on_target(self, port_file) - - new_platform = lldb.SBPlatform("remote-" + self.getPlatform()) - self.dbg.SetSelectedPlatform(new_platform) - - connect_url = "connect://[%s]:%s" % (hostname, socket_id) - self.runCmd("platform connect %s" % connect_url) - wd = self.getBuildArtifact("wd") - self.assertSuccess(new_platform.MakeDirectory(wd)) - new_platform.SetWorkingDirectory(wd) - self.runCmd("target create {}".format(self.getBuildArtifact("a.out"))) - self.runCmd("run") - self.expect( - "process status", - patterns=["Process .* exited with status = 0"], - ) diff --git a/lldb/tools/lldb-server/SystemInitializerLLGS.h b/lldb/tools/lldb-server/SystemInitializerLLGS.h index c6020b0dd37da..4469a8ba5f60a 100644 --- a/lldb/tools/lldb-server/SystemInitializerLLGS.h +++ b/lldb/tools/lldb-server/SystemInitializerLLGS.h @@ -11,17 +11,10 @@ #include "lldb/Initialization/SystemInitializer.h" #include "lldb/Initialization/SystemInitializerCommon.h" -#include "lldb/Utility/FileSpec.h" class SystemInitializerLLGS : public lldb_private::SystemInitializerCommon { public: - SystemInitializerLLGS() - : SystemInitializerCommon( - // Finding the shared libraries directory on lldb-server is broken - // since lldb-server isn't dynamically linked with liblldb.so. - // Clearing the filespec here causes GetShlibDir to fail and - // GetSupportExeDir to fall-back to using the binary path instead. - [](lldb_private::FileSpec &file) { file.Clear(); }) {} + SystemInitializerLLGS() : SystemInitializerCommon(nullptr) {} llvm::Error Initialize() override; void Terminate() override; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
