[zorg] r340057 - lldb_cmake_builder: Use the regular builddir

Adrian Prantl via llvm-commits llvm-commits at lists.llvm.org
Fri Aug 17 10:49:09 PDT 2018


Author: adrian
Date: Fri Aug 17 10:49:09 2018
New Revision: 340057

URL: http://llvm.org/viewvc/llvm-project?rev=340057&view=rev
Log:
lldb_cmake_builder: Use the regular builddir

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

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=340057&r1=340056&r2=340057&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Fri Aug 17 10:49:09 2018
@@ -574,15 +574,15 @@ def lldb_builder():
 def lldb_cmake_builder():
     """Do a CMake build of lldb."""
 
-    test_dir = os.path.join(conf.lldbbuilddir(), 'test')
+    test_dir = os.path.join(conf.builddir(), 'test')
     log_dir = os.path.join(test_dir, 'log')
     results_file = os.path.join(test_dir, 'results.xml')
-    dest_dir = os.path.join(conf.lldbbuilddir(), 'results', 'lldb')
-    run_ws(["mkdir", "-p", conf.lldbbuilddir()])
+    dest_dir = os.path.join(conf.builddir(), 'results', 'lldb')
+    run_ws(["mkdir", "-p", conf.builddir()])
 
     header("Configure")
     dotest_args=['--arch', 'x86_64', '--build-dir',
-                 conf.lldbbuilddir()+'/lldb-test-build.noindex',
+                 conf.builddir()+'/lldb-test-build.noindex',
                  '--session-file-format' , 'fm',
                  '-s='+log_dir,
                  '--results-file', results_file,
@@ -605,15 +605,15 @@ def lldb_cmake_builder():
         cmake_cmd.extend(['-DCMAKE_C_COMPILER=' + conf.CC(),
                           '-DCMAKE_CXX_COMPILER=' + conf.CC() + "++"])
 
-    run_cmd(conf.lldbbuilddir(), cmake_cmd)
+    run_cmd(conf.builddir(), cmake_cmd)
     footer()
 
     header("Build")
-    run_cmd(conf.lldbbuilddir(), [NINJA])
+    run_cmd(conf.builddir(), [NINJA])
     footer()
 
     header("Run Tests")
-    run_cmd(conf.lldbbuilddir(), ['/usr/bin/env', 'TERM=vt100', NINJA, 'check-lldb'])
+    run_cmd(conf.builddir(), ['/usr/bin/env', 'TERM=vt100', NINJA, 'check-lldb'])
     footer()
 
 




More information about the llvm-commits mailing list