[zorg] r267920 - Make the LLDB Windows builder use release mode.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Thu Apr 28 12:25:20 PDT 2016


Author: zturner
Date: Thu Apr 28 14:25:19 2016
New Revision: 267920

URL: http://llvm.org/viewvc/llvm-project?rev=267920&view=rev
Log:
Make the LLDB Windows builder use release mode.

Also set the LLDB_TEST_COMPILER CMake variable.

Differential Revision: http://reviews.llvm.org/D19670

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=267920&r1=267919&r2=267920&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Apr 28 14:25:19 2016
@@ -565,7 +565,7 @@ def _get_lldb_builders():
         {'name': "lldb-x86-windows-msvc2015",
          'slavenames': ["zturner-win2008"],
          'builddir': "lldb-windows-x86",
-         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},
+         '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=267920&r1=267919&r2=267920&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Thu Apr 28 14:25:19 2016
@@ -93,11 +93,13 @@ def getLLDBWindowsCMakeBuildFactory(
 
     # Use batch files instead of ShellCommand directly, Windows quoting is
     # borked. FIXME: See buildbot ticket #595 and buildbot ticket #377.
+    clang_exe = 'build_dir/bin/clang.exe'    # ./bin/clang.exe
     f.addStep(batch_file_download.BatchFileDownload(name='cmakegen',
                                 command=[cmake, "-G", "Ninja", "../llvm",
                                          "-DCMAKE_BUILD_TYPE="+config,
                                          '-DPYTHON_HOME=' + python_source_dir,
-                                         "-DCMAKE_INSTALL_PREFIX=../install"]
+                                         "-DCMAKE_INSTALL_PREFIX=../install",
+                                         "-DLLDB_TEST_COMPILER=" + clang_exe]
                                          + extra_cmake_args,
                                 workdir=build_dir))
 




More information about the llvm-commits mailing list