Build and run tests against toolchain instead of llvm-build-dir

Install everything we need to run tests (CMake modules, FileCheck, etc.)
into the toolchain directory.

Add synthetic target 'all' for llvm-install-components. Also we must set
LLVM_INSTALL_UTILS=ON, so the utilities required by tests (e.g.,
FileCheck) are included in the install target.

Author: yln

utils/build-presets.ini

@@ -1029,11 +1029,13 @@ llvm-include-tests
 mixin-preset=buildbot_incremental_linux,llvm-only
 build-subdir=buildbot_incremental_tsan_libdispatch_test
 
+llvm-cmake-options=-DLLVM_INSTALL_UTILS=ON
+llvm-install-components=all
+
 libdispatch-cmake-options=-DENABLE_SWIFT=OFF
 libdispatch
 install-libdispatch
 
-lit-args=-v --timeout=10
 tsan-libdispatch-test
 
 

utils/build-script-impl

@@ -3475,7 +3475,11 @@ for host in "${ALL_HOSTS[@]}"; do
                 if [[ -z "${LLVM_INSTALL_COMPONENTS}" ]] ; then
                     continue
                 fi
-                INSTALL_TARGETS=install-$(echo ${LLVM_INSTALL_COMPONENTS} | sed -E 's/;/ install-/g')
+                if [[ "${LLVM_INSTALL_COMPONENTS}" == "all" ]]; then
+                    INSTALL_TARGETS=install
+                else
+                    INSTALL_TARGETS=install-$(echo ${LLVM_INSTALL_COMPONENTS} | sed -E 's/;/ install-/g')
+                fi
                 ;;
             libcxx)
                 if [[ -z "${INSTALL_LIBCXX}" ]] ; then

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

@@ -16,8 +16,8 @@
 from .. import shell
 
 
-def join_path(p1, p2):
-    return os.path.abspath(os.path.join(p1, p2))
+def join_path(*paths):
+    return os.path.abspath(os.path.join(*paths))
 
 class TSanLibDispatch(product.Product):
     @classmethod
@@ -30,21 +30,21 @@ def is_build_script_impl_product(cls):
 
     def build(self, host_target):
         """Build TSan runtime (compiler-rt)."""
-        rt_source_dir = join_path(self.source_dir, '../compiler-rt')
-        llvm_build_dir = join_path(self.build_dir, '../llvm-' + host_target)
-        libdispatch_path = join_path(self.args.install_destdir, 'usr')
+        rt_source_dir = join_path(self.source_dir, os.pardir, 'compiler-rt')
+        toolchain_path = join_path(self.args.install_destdir, 'usr')
 
         config_cmd = [
             'cmake',
             '-GNinja',
-            '-DCMAKE_PREFIX_PATH=%s' % llvm_build_dir,
+            '-DCMAKE_PREFIX_PATH=%s' % toolchain_path,
             '-DCMAKE_C_COMPILER=clang',
             '-DCMAKE_CXX_COMPILER=clang++',
             '-DCMAKE_BUILD_TYPE=Release',
             '-DLLVM_ENABLE_ASSERTIONS=ON',
             '-DCOMPILER_RT_INCLUDE_TESTS=ON',
+            '-DCOMPILER_RT_BUILD_XRAY=OFF',
             '-DCOMPILER_RT_INTERCEPT_LIBDISPATCH=ON',
-            '-DCOMPILER_RT_LIBDISPATCH_INSTALL_PATH=%s' % libdispatch_path,
+            '-DCOMPILER_RT_LIBDISPATCH_INSTALL_PATH=%s' % toolchain_path,
             rt_source_dir]
         build_cmd = ['ninja', 'tsan']