[llvm-commits] [zorg] r161646 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[David Blaikie]

Author: dblaikie
Date: Thu Aug  9 19:51:38 2012
New Revision: 161646

URL: http://llvm.org/viewvc/llvm-project?rev=161646&view=rev
Log:
Include clang-tools-extra in Clang buildbots.

Reviewed by Chandler Carruth.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=161646&r1=161645&r2=161646&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Aug  9 19:51:38 2012
@@ -98,6 +98,10 @@
           [WithProperties('http://llvm.org/svn/llvm-project/cfe/trunk@%s' %
                           trunk_revision),
            '%s/tools/clang' % llvm_srcdir]
+        svn_co_clang_tools_extra = svn_co + \
+          [WithProperties('http://llvm.org/svn/llvm-project/clang-tools-extra/trunk@%s' %
+                          trunk_revision),
+           '%s/tools/clang/tools/extra' % llvm_srcdir]
 
         f.addStep(ShellCommand(name='svn-llvm',
                                command=svn_co_llvm,
@@ -107,6 +111,10 @@
                                command=svn_co_clang,
                                haltOnFailure=True,
                                workdir='.'))
+        f.addStep(ShellCommand(name='svn-clang-tools-extra',
+                               command=svn_co_clang_tools_extra,
+                               haltOnFailure=True,
+                               workdir='.'))
     else:
         f.addStep(SVN(name='svn-llvm',
                       mode='update',
@@ -118,6 +126,11 @@
                       baseURL='http://llvm.org/svn/llvm-project/cfe/',
                       defaultBranch='trunk',
                       workdir='%s/tools/clang' % llvm_srcdir))
+        f.addStep(SVN(name='svn-clang-tools-extra',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
+                      defaultBranch='trunk',
+                      workdir='%s/tools/clang/tools/extra' % llvm_srcdir))
         if checkout_compiler_rt:
             f.addStep(SVN(name='svn-compiler-rt',
                           mode='update',
@@ -356,12 +369,14 @@
                       mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
                       defaultBranch='trunk',
                       workdir='llvm'))
-
-    if update:
         f.addStep(SVN(name='svn-clang',
                       mode='update', baseURL='http://llvm.org/svn/llvm-project/cfe/',
                       defaultBranch='trunk',
                       workdir='llvm/tools/clang'))
+        f.addStep(SVN(name='svn-clang-tools-extra',
+                      mode='update', baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
+                      defaultBranch='trunk',
+                      workdir='llvm/tools/clang/tools/extra'))
 
     # Full & fast clean.
     if clean:
@@ -433,12 +448,14 @@
                       mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
                       defaultBranch='trunk',
                       workdir='llvm'))
-
-    if update:
         f.addStep(SVN(name='svn-clang',
                       mode='update', baseURL='http://llvm.org/svn/llvm-project/cfe/',
                       defaultBranch='trunk',
                       workdir='llvm/tools/clang'))
+        f.addStep(SVN(name='svn-clang-tools-extra',
+                      mode='update', baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
+                      defaultBranch='trunk',
+                      workdir='llvm/tools/clang/tools/extra'))
 
     # Full & fast clean.
     if clean: