[zorg] r342559 - [build.py] lldb-xcode: Use the correct path to the built FileCheck binary

[Vedant Kumar via llvm-commits]

Author: vedantk
Date: Wed Sep 19 10:51:27 2018
New Revision: 342559

URL: http://llvm.org/viewvc/llvm-project?rev=342559&view=rev
Log:
[build.py] lldb-xcode: Use the correct path to the built FileCheck binary

The host compiler artifact does not contain a FileCheck binary. Use the
binary built as a part of the embedded llvm.

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=342559&r1=342558&r2=342559&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Wed Sep 19 10:51:27 2018
@@ -523,8 +523,9 @@ def lldb_builder():
     if llvm_build_dir is None or llvm_build_dir_arch is None:
         raise Exception("failed to retrieve LLVM build-related settings "
                         "from Xcode")
-    built_clang_path = os.path.join(llvm_build_dir, llvm_build_dir_arch,
-                                    "bin", "clang")
+    llvm_build_bin_dir = os.path.join(llvm_build_dir, llvm_build_dir_arch, "bin")
+    built_clang_path = os.path.join(llvm_build_bin_dir, "clang")
+    built_filecheck_path = os.path.join(llvm_build_bin_dir, "FileCheck")
     effective_clang = os.environ.get("LLDB_PYTHON_TESTSUITE_CC",
                                      built_clang_path)
 
@@ -562,7 +563,7 @@ def lldb_builder():
             "--env", "TERM=vt100",
             "-O--xpass=ignore",
             "--dsymutil="+os.path.join(os.path.dirname(effective_clang), 'dsymutil'),
-            "--filecheck="+os.path.join(os.path.dirname(effective_clang), 'FileCheck')
+            "--filecheck="+built_filecheck_path
         ]
 
         header("Run LLDB Python-based test suite ({} targets)".format(arch))