[zorg] r178224 - [phased builders] Ensure that the phased builders check out clang-tools-extra.

Michael Gottesman mgottesman at apple.com
Wed Mar 27 23:20:58 PDT 2013


Author: mgottesman
Date: Thu Mar 28 01:20:57 2013
New Revision: 178224

URL: http://llvm.org/viewvc/llvm-project?rev=178224&view=rev
Log:
[phased builders] Ensure that the phased builders check out clang-tools-extra.

This would have caught the build failure in trunk revision r178214.

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=178224&r1=178223&r2=178224&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Mar 28 01:20:57 2013
@@ -675,6 +675,11 @@ def phasedClang(config_options, is_boots
                       repourl='http://llvm.org/svn/llvm-project/cfe/trunk',
                       workdir='clang.src', retry = (60, 5),
                       description='pull.clang', alwaysUseLatest=False))
+    f.addStep(HostSVN(name='pull.clang-tools-extra', mode='incremental',
+                      method='fresh',
+                      repourl='http://llvm.org/svn/llvm-project/clang-tools-extra/trunk',
+                      workdir='clang-tools-extra.src', alwaysUseLatest=False,
+                      retry=(60, 5), description='pull.clang-tools-extra'))
     f.addStep(HostSVN(name='pull.compiler-rt', mode='incremental', method='fresh',
                       repourl='http://llvm.org/svn/llvm-project/compiler-rt/trunk',
                       workdir='compiler-rt.src',
@@ -692,6 +697,12 @@ def phasedClang(config_options, is_boots
               command=['ln', '-sfv', '../../compiler-rt.src', 'compiler-rt'],
               haltOnFailure=True, workdir='llvm/projects',
               description = ['ln', 'compiler-rt sources']))
+    # Create a symlink in clang for clang-tools-extra.
+    f.addStep(buildbot.steps.shell.ShellCommand(
+              name='ln.clang-tools-extra-sources',
+              command=['ln', '-sfv', '../../clang-tools-extra.src', 'extra'],
+              haltOnFailure=True, workdir='clang.src/tools',
+              description=['ln', 'clang-tools-extra sources']))    
     # Checkout the supplemental 'debuginfo-tests' repository.
     debuginfo_url = 'http://llvm.org/svn/llvm-project/debuginfo-tests/trunk'
     f.addStep(HostSVN(name='pull.debug-info tests', mode='incremental',





More information about the llvm-commits mailing list