Author: Shubham Sandeep Rastogi Date: 2023-07-14T11:19:16-04:00 New Revision: a76b3bec6c29f473fa0727c8aef01c7b31d400fd
URL: https://github.com/llvm/llvm-project/commit/a76b3bec6c29f473fa0727c8aef01c7b31d400fd DIFF: https://github.com/llvm/llvm-project/commit/a76b3bec6c29f473fa0727c8aef01c7b31d400fd.diff LOG: Revert "Revert "[lldb][LocateModuleCallback] Fix LocateModuleCallbackTest"" This reverts commit 668a3efd42e7fea19a0d331f73345f2ac13cdf4f. Reverting because of build errors: In file included from /Users/buildslave/jenkins/workspace/as-lldb-cmake/llvm-project/lldb/source/API/SBPlatform.cpp:19: /Users/buildslave/jenkins/workspace/as-lldb-cmake/llvm-project/lldb/include/lldb/Target/Target.h:1035:18: warning: parameter 'merged' not found in the function declaration [-Wdocumentation] Added: Modified: lldb/unittests/Target/LocateModuleCallbackTest.cpp Removed: ################################################################################ diff --git a/lldb/unittests/Target/LocateModuleCallbackTest.cpp b/lldb/unittests/Target/LocateModuleCallbackTest.cpp index cd5eb4473473bb..42a0790bca58f2 100644 --- a/lldb/unittests/Target/LocateModuleCallbackTest.cpp +++ b/lldb/unittests/Target/LocateModuleCallbackTest.cpp @@ -22,6 +22,7 @@ using namespace lldb; using namespace lldb_private; using namespace lldb_private::platform_android; +using namespace lldb_private::platform_linux; using namespace lldb_private::breakpad; using namespace testing; @@ -190,7 +191,8 @@ ProcessSP MockProcessCreateInstance(TargetSP target_sp, ListenerSP listener_sp, class LocateModuleCallbackTest : public testing::Test { SubsystemRAII<FileSystem, HostInfo, ObjectFileBreakpad, ObjectFileELF, - PlatformAndroid, SymbolFileBreakpad, SymbolFileSymtab> + PlatformAndroid, PlatformLinux, SymbolFileBreakpad, + SymbolFileSymtab> subsystems; public: @@ -202,6 +204,9 @@ class LocateModuleCallbackTest : public testing::Test { m_test_dir); // Create Debugger. + ArchSpec host_arch("i386-pc-linux"); + Platform::SetHostPlatform( + platform_linux::PlatformLinux::CreateInstance(true, &host_arch)); m_debugger_sp = Debugger::CreateInstance(); EXPECT_TRUE(m_debugger_sp); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits