[zorg] r269510 - Use the full path to clang.exe in LLDB_TEST_COMPILER

[Zachary Turner via llvm-commits]

Author: zturner
Date: Fri May 13 17:52:34 2016
New Revision: 269510

URL: http://llvm.org/viewvc/llvm-project?rev=269510&view=rev
Log:
Use the full path to clang.exe in LLDB_TEST_COMPILER

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

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=269510&r1=269509&r2=269510&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri May 13 17:52:34 2016
@@ -85,6 +85,13 @@ def getLLDBWindowsCMakeBuildFactory(
     # Global configurations
     build_dir='build'
 
+    # get full path to build directory
+    f.addStep(SetProperty(name="get_builddir",
+                          command=["pwd"],
+                          property="builddir",
+                          description="set build dir",
+                          workdir=build_dir))
+
     ############# CLEANING
     cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
     f.addStep(RemoveDirectory(name='clean '+build_dir,
@@ -96,13 +103,14 @@ def getLLDBWindowsCMakeBuildFactory(
 
     # Use batch files instead of ShellCommand directly, Windows quoting is
     # borked. FIXME: See buildbot ticket #595 and buildbot ticket #377.
-    clang_exe = 'bin/clang.exe'    # ./bin/clang.exe
+    clang_exe = WithProperties('%(builddir)s/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",
-                                         "-DLLDB_TEST_COMPILER=" + clang_exe]
+                                         '-DLLDB_TEST_COMPILER="' + clang_exe + '"']
                                          + extra_cmake_args,
                                 workdir=build_dir))