[llvm-commits] [zorg] r152417 - /zorg/trunk/lnt/lnt/testing/util/compilers.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Mar  9 12:33:26 2012
New Revision: 152417

URL: http://llvm.org/viewvc/llvm-project?rev=152417&view=rev
Log:
[LNT] lnt.testing.util.compilers: Accept Clang version info like (fooo
feed32beef) which is the exciting and incredibly useful information one might
see with git repos.

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

Modified: zorg/trunk/lnt/lnt/testing/util/compilers.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/testing/util/compilers.py?rev=152417&r1=152416&r2=152417&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/testing/util/compilers.py (original)
+++ zorg/trunk/lnt/lnt/testing/util/compilers.py Fri Mar  9 12:33:26 2012
@@ -94,8 +94,14 @@
             if cc_src_branch == '$URL$':
                 cc_src_branch = None
         else:
-            error('unable to determine Clang development build info: %r' % (
-                    (cc_name, cc_build_string, cc_extra),))
+            # Otherwise, see if we can match a branch and a tag name. That could
+            # be a git hash.
+            m = re.match(r'\(([^ ]+) ([^ ]+)\)', cc_build_string)
+            if m:
+                cc_src_branch,cc_src_revision = m.groups()
+            else:
+                error('unable to determine Clang development build info: %r' % (
+                        (cc_name, cc_build_string, cc_extra),))
 
         m = re.search('clang-([0-9]*)', cc_src_branch)
         if m: