labath created this revision.
labath added reviewers: JDevlieghere, jasonmolenda.
Herald added a subscriber: mgorny.
The plugin already builds fine on other platforms (linux, at least). All
that was necessary was to revitalize the hack in PlatformDarwinKernel
(not a very pretty hack, but it gets us going at least).
I haven't done a thorough investigation of the state of the plugin on
other platforms, but at least the two core file tests we have seem to
pass, so I enable them.
https://reviews.llvm.org/D47133
Files:
packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py
packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
source/API/SystemInitializerFull.cpp
source/Plugins/DynamicLoader/CMakeLists.txt
source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
source/Plugins/Process/CMakeLists.txt
Index: source/Plugins/Process/CMakeLists.txt
===================================================================
--- source/Plugins/Process/CMakeLists.txt
+++ source/Plugins/Process/CMakeLists.txt
@@ -11,9 +11,9 @@
add_subdirectory(Windows/Common)
elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_subdirectory(MacOSX-Kernel)
- add_subdirectory(mach-core)
endif()
add_subdirectory(gdb-remote)
add_subdirectory(Utility)
add_subdirectory(elf-core)
+add_subdirectory(mach-core)
add_subdirectory(minidump)
Index: source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
===================================================================
--- source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
+++ source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
@@ -201,6 +201,7 @@
// source/Host/macosx/cfcpp utilities.
class PlatformDarwinKernel {
+public:
static lldb_private::ConstString GetPluginNameStatic();
};
Index: source/Plugins/DynamicLoader/CMakeLists.txt
===================================================================
--- source/Plugins/DynamicLoader/CMakeLists.txt
+++ source/Plugins/DynamicLoader/CMakeLists.txt
@@ -1,9 +1,6 @@
+add_subdirectory(Darwin-Kernel)
add_subdirectory(MacOSX-DYLD)
add_subdirectory(POSIX-DYLD)
add_subdirectory(Static)
add_subdirectory(Hexagon-DYLD)
add_subdirectory(Windows-DYLD)
-
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
- add_subdirectory(Darwin-Kernel)
-endif()
Index: source/API/SystemInitializerFull.cpp
===================================================================
--- source/API/SystemInitializerFull.cpp
+++ source/API/SystemInitializerFull.cpp
@@ -84,6 +84,7 @@
#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
#include "Plugins/Process/elf-core/ProcessElfCore.h"
#include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
+#include "Plugins/Process/mach-core/ProcessMachCore.h"
#include "Plugins/Process/minidump/ProcessMinidump.h"
#include "Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h"
#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h"
@@ -104,7 +105,6 @@
#include "Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h"
#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
-#include "Plugins/Process/mach-core/ProcessMachCore.h"
#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
#endif
#include "Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h"
@@ -313,6 +313,7 @@
JITLoaderGDB::Initialize();
ProcessElfCore::Initialize();
+ ProcessMachCore::Initialize();
minidump::ProcessMinidump::Initialize();
MemoryHistoryASan::Initialize();
AddressSanitizerRuntime::Initialize();
@@ -353,7 +354,6 @@
#if defined(__APPLE__)
SymbolVendorMacOSX::Initialize();
ProcessKDP::Initialize();
- ProcessMachCore::Initialize();
PlatformAppleTVSimulator::Initialize();
PlatformAppleWatchSimulator::Initialize();
PlatformRemoteAppleTV::Initialize();
@@ -440,6 +440,7 @@
JITLoaderGDB::Terminate();
ProcessElfCore::Terminate();
+ ProcessMachCore::Terminate();
minidump::ProcessMinidump::Terminate();
MemoryHistoryASan::Terminate();
AddressSanitizerRuntime::Terminate();
@@ -471,7 +472,6 @@
#if defined(__APPLE__)
DynamicLoaderDarwinKernel::Terminate();
- ProcessMachCore::Terminate();
ProcessKDP::Terminate();
SymbolVendorMacOSX::Terminate();
PlatformAppleTVSimulator::Terminate();
Index: packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
+++ packages/Python/lldbsuite/test/functionalities/source-map/TestTargetSourceMap.py
@@ -7,7 +7,6 @@
mydir = TestBase.compute_mydir(__file__)
- @skipUnlessDarwin
@no_debug_info_test
def test_source_map(self):
"""Test target.source-map' functionality."""
Index: packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py
+++ packages/Python/lldbsuite/test/functionalities/postmortem/mach-core/TestMachCore.py
@@ -26,7 +26,6 @@
lldb.DBG.SetSelectedPlatform(self._initial_platform)
super(MachCoreTestCase, self).tearDown()
- @skipUnlessDarwin
def test_selected_thread(self):
"""Test that the right thread is selected after a core is loaded."""
# Create core form YAML.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
