[zorg] r260144 - Use the enviroment for build dir

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Mon Feb  8 15:04:31 2016
New Revision: 260144

URL: http://llvm.org/viewvc/llvm-project?rev=260144&view=rev
Log:
Use the enviroment for build dir

And fix unit tests

Modified:
    zorg/trunk/test/jenkins/test_build.py
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/test/jenkins/test_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/test/jenkins/test_build.py?rev=260144&r1=260143&r2=260144&view=diff
==============================================================================
--- zorg/trunk/test/jenkins/test_build.py (original)
+++ zorg/trunk/test/jenkins/test_build.py Mon Feb  8 15:04:31 2016
@@ -24,7 +24,7 @@
 # CHECK-SIMPLE: cd 
 # CHECK-SIMPLE: 'mkdir' './Build' './Root'
 # CHECK-SIMPLE: cd 
-# CHECK-SIMPLE: '/usr/bin/xcrun' 'cmake' '-G' 'Ninja' '-C' 
+# CHECK-SIMPLE: '/usr/local/bin/cmake' '-G' 'Ninja' '-C' 
 # CHECK-SIMPLE: '-DLLVM_ENABLE_ASSERTIONS:BOOL=FALSE'
 # CHECK-SIMPLE: '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
 # CHECK-SIMPLE: '-DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja'
@@ -59,7 +59,7 @@
 
 # RUN: python %{src_root}/zorg/jenkins/build.py clang all --assertions > %t-assert.log
 # RUN: FileCheck --check-prefix CHECK-ASSERT < %t-assert.log %s
-# CHECK-ASSERT: '/usr/bin/xcrun' 'cmake' '-G' 'Ninja' '-C'
+# CHECK-ASSERT: '/usr/local/bin/cmake' '-G' 'Ninja' '-C'
 # CHECK-ASSERT: '-DLLVM_ENABLE_ASSERTIONS:BOOL=TRUE'
 
 # Check LTO

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=260144&r1=260143&r2=260144&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Mon Feb  8 15:04:31 2016
@@ -12,7 +12,7 @@ import math
 
 SERVER = "labmaster2.local"
 
-BUILD_RECORD_TEMPLATE = '/clang.build'
+
 NINJA = "/usr/local/bin/ninja"
 
 
@@ -233,7 +233,7 @@ def clang_builder(target):
     if target == "all" or target == "build":
         # Clean the build directory.
         run_ws(['rm', '-rf', 'clang.roots'])
-
+        
         debug_src_dir = 'debuginfo-tests.src'
 
         sdk_name = 'macosx'
@@ -248,7 +248,7 @@ def clang_builder(target):
 
         project = 'clang'
 
-        clang_br = conf.workspace + BUILD_RECORD_TEMPLATE.format(project)
+        clang_br = os.path.join(conf.workspace, conf._build_dir)
         next_section("Build Directory")
         run_ws(["mkdir", "-p", clang_br])
 
@@ -279,7 +279,7 @@ def clang_builder(target):
             '-DLLVM_BUILD_TESTS=On',
             '-DLLVM_INCLUDE_TESTS=On',
             '-DCLANG_INCLUDE_TESTS=On',
-            '-DLLVM_INCLUDE_UTILS=On'
+            '-DLLVM_INCLUDE_UTILS=On',
             '-DLIBCXX_INSTALL_HEADERS=On',
             '-DLIBCXX_OVERRIDE_DARWIN_INSTALL=On',
             '-DLIBCXX_INSTALL_LIBRARY=Off',