[zorg] r269342 - Disable check-lldb on Windows, but build LLD.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Thu May 12 15:08:14 2016
New Revision: 269342

URL: http://llvm.org/viewvc/llvm-project?rev=269342&view=rev
Log:
Disable check-lldb on Windows, but build LLD.

We need LLD in order to successfully run tests on Windows.  So
we don't keep the bot red for too long, let's get this working
first and then try to re-enable tests after we confirm that
building LLD works.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=269342&r1=269341&r2=269342&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu May 12 15:08:14 2016
@@ -565,7 +565,7 @@ def _get_lldb_builders():
         {'name': "lldb-x86-windows-msvc2015",
          'slavenames': ["zturner-win2008"],
          'builddir': "lldb-windows-x86",
-         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(test=True)},
+         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory()},
         {'name': "lldb-x86-win7-msvc",
          'slavenames': ["hexagon-build-01"],
          'builddir': "builddir/lldb-win7-msvc",

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=269342&r1=269341&r2=269342&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Thu May 12 15:08:14 2016
@@ -14,9 +14,8 @@ from zorg.buildbot.commands.LitTestComma
 from zorg.buildbot.builders.Util import getVisualStudioEnvironment
 from zorg.buildbot.builders.Util import extractSlaveEnvironment
 
-# We *must* checkout at least Clang, LLVM, and LLDB.  Once we add a step to run
-# tests (e.g. ninja check-lldb), we will also need to add a step for LLD, since
-# MSVC LD.EXE cannot link executables with DWARF debug info.
+# We *must* checkout at least Clang, LLVM, and LLDB.  Also check out LLD since
+# it is needed to run the LLDB test suite.
 def getLLDBSource(f,llvmTopDir='llvm'):
     f.addStep(SVN(name='svn-llvm',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
@@ -26,6 +25,10 @@ def getLLDBSource(f,llvmTopDir='llvm'):
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/cfe/',
                   defaultBranch='trunk',
                   workdir='%s/tools/clang' % llvmTopDir))
+    f.addStep(SVN(name='svn-lld',
+                  mode='update', baseURL='http://llvm.org/svn/llvm-project/lld/',
+                  defaultBranch='trunk',
+                  workdir='%s/tools/lld' % llvmTopDir))
     f.addStep(SVN(name='svn-lldb',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/lldb/',
                   defaultBranch='trunk',