diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/help/TestHelp.py | 7 | ||||
| -rw-r--r-- | lldb/source/lldb.cpp | 27 |
2 files changed, 16 insertions, 18 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py index 2d912202670..21eeb0bf63a 100644 --- a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py +++ b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py @@ -88,13 +88,10 @@ class HelpCommandTestCase(TestBase): """Test 'help version' and 'version' commands.""" self.expect("help version", substrs=['Show the LLDB debugger version.']) - version_str = self.version_number_string() import re + version_str = self.version_number_string() match = re.match('[0-9]+', version_str) - if sys.platform.startswith("darwin"): - search_regexp = ['lldb-' + (version_str if match else '[0-9]+')] - else: - search_regexp = ['lldb version (\d|\.)+.*\n'] + search_regexp = ['lldb( version|-' + (version_str if match else '[0-9]+') + ').*\n'] self.expect("version", patterns=search_regexp) diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index 3817dd4574e..efdcef8f052 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -47,25 +47,26 @@ const char *lldb_private::GetVersion() { // as the clang tool. static std::string g_version_str; if (g_version_str.empty()) { + +#ifdef LLDB_VERSION_STRING + g_version_str += EXPAND_AND_QUOTE(LLDB_VERSION_STRING); +#else g_version_str += "lldb version "; g_version_str += CLANG_VERSION_STRING; +#endif const char *lldb_repo = GetLLDBRepository(); - if (lldb_repo) { - g_version_str += " ("; - g_version_str += lldb_repo; - } - const char *lldb_rev = GetLLDBRevision(); - if (lldb_rev) { - g_version_str += " revision "; - g_version_str += lldb_rev; + if (lldb_repo || lldb_rev) { + g_version_str += " ("; + if (lldb_repo) + g_version_str += lldb_repo; + if (lldb_rev) { + g_version_str += " revision "; + g_version_str += lldb_rev; + } g_version_str += ")"; } -#ifdef LLDB_VERSION_STRING - g_version_str += " ("; - g_version_str += EXPAND_AND_QUOTE(LLDB_VERSION_STRING); - g_version_str += ")"; -#endif + std::string clang_rev(clang::getClangRevision()); if (clang_rev.length() > 0) { g_version_str += "\n clang revision "; |
