One more cleanup to lldb version printing

With this patch LLDB_VERSION_STRING replaces "lldb version x.x.x" if it is set. This allows builds to not display the open source version numbers if the people making the distribution overrides the LLDB_VERSION_STRING.

Since LLDB_VERSION_STRING is always overridden on Darwin, this means the first line of lldb -version on Darwin is:

lldb-360.99.0 (<repo path> revision <revision>)

llvm-svn: 286899

1 files changed, 2 insertions, 5 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)