[LNT] r211148 - Teach LNT how to parse version output from a CMake build.

[James Molloy]

Author: jamesm
Date: Wed Jun 18 02:40:53 2014
New Revision: 211148

URL: http://llvm.org/viewvc/llvm-project?rev=211148&view=rev
Log:
Teach LNT how to parse version output from a CMake build.


Modified:
    lnt/trunk/lnt/testing/util/compilers.py

Modified: lnt/trunk/lnt/testing/util/compilers.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/testing/util/compilers.py?rev=211148&r1=211147&r2=211148&view=diff
==============================================================================
--- lnt/trunk/lnt/testing/util/compilers.py (original)
+++ lnt/trunk/lnt/testing/util/compilers.py Wed Jun 18 02:40:53 2014
@@ -132,6 +132,11 @@ def get_cc_info(path, cc_flags=[]):
         if m:
             cc_src_branch,_,cc_src_revision = m.groups()
 
+            # With a CMake build, the branch is not emitted.
+            if cc_src_branch and not cc_src_revision and cc_src_branch.isdigit():
+                cc_src_revision = cc_src_branch
+                cc_src_branch = None
+
             # These show up with git-svn.
             if cc_src_branch == '$URL$':
                 cc_src_branch = ""
@@ -163,6 +168,12 @@ def get_cc_info(path, cc_flags=[]):
             m = re.match(r'\((.+) ([^ ]+)\)', cc_extra)
             if m:
                 cc_alt_src_branch,cc_alt_src_revision = m.groups()
+
+                # With a CMake build, the branch is not emitted.
+                if cc_src_branch and not cc_src_revision and cc_src_branch.isdigit():
+                    cc_alt_src_revision = cc_alt_src_branch
+                    cc_alt_src_branch = None
+                
             else:
                 error('unable to determine Clang development build info: %r' % (
                         (cc_name, cc_build_string, cc_extra),))