diff options
| -rw-r--r-- | lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp | 10 | ||||
| -rw-r--r-- | lldb/test/functionalities/platform/TestPlatformCommand.py | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index ef4bd41dc78..1ea07d32c86 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -336,12 +336,14 @@ PlatformLinux::GetStatus (Stream &strm) { struct utsname un; - if (uname(&un)) { - strm << "Linux"; + Platform::GetStatus(strm); + + if (uname(&un)) return; - } - strm << un.sysname << ' ' << un.release << ' ' << un.version << '\n'; + strm.Printf (" Kernel: %s\n", un.sysname); + strm.Printf (" Release: %s\n", un.release); + strm.Printf (" Version: %s\n", un.version); } size_t diff --git a/lldb/test/functionalities/platform/TestPlatformCommand.py b/lldb/test/functionalities/platform/TestPlatformCommand.py index 8aab0e5cf52..dbdebea5c87 100644 --- a/lldb/test/functionalities/platform/TestPlatformCommand.py +++ b/lldb/test/functionalities/platform/TestPlatformCommand.py @@ -27,7 +27,6 @@ class PlatformCommandTestCase(TestBase): self.expect("platform process info", error=True, substrs = ['one or more process id(s) must be specified']) - @expectedFailureLinux # due to llvm.org/pr14806 -- "platform status" prints more information on Mac OS X than on Linux def test_status(self): self.expect("platform status", substrs = ['Platform', 'Triple', 'OS Version', 'Kernel', 'Hostname']) |
