Skip to content

Commit a76b3be

Browse files
Revert "Revert "[lldb][LocateModuleCallback] Fix LocateModuleCallbackTest""
This reverts commit 668a3ef. 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]
1 parent 55147ce commit a76b3be

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

lldb/unittests/Target/LocateModuleCallbackTest.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using namespace lldb;
2323
using namespace lldb_private;
2424
using namespace lldb_private::platform_android;
25+
using namespace lldb_private::platform_linux;
2526
using namespace lldb_private::breakpad;
2627
using namespace testing;
2728

@@ -190,7 +191,8 @@ ProcessSP MockProcessCreateInstance(TargetSP target_sp, ListenerSP listener_sp,
190191

191192
class LocateModuleCallbackTest : public testing::Test {
192193
SubsystemRAII<FileSystem, HostInfo, ObjectFileBreakpad, ObjectFileELF,
193-
PlatformAndroid, SymbolFileBreakpad, SymbolFileSymtab>
194+
PlatformAndroid, PlatformLinux, SymbolFileBreakpad,
195+
SymbolFileSymtab>
194196
subsystems;
195197

196198
public:
@@ -202,6 +204,9 @@ class LocateModuleCallbackTest : public testing::Test {
202204
m_test_dir);
203205

204206
// Create Debugger.
207+
ArchSpec host_arch("i386-pc-linux");
208+
Platform::SetHostPlatform(
209+
platform_linux::PlatformLinux::CreateInstance(true, &host_arch));
205210
m_debugger_sp = Debugger::CreateInstance();
206211
EXPECT_TRUE(m_debugger_sp);
207212

0 commit comments

Comments
 (0)