Merge pull request #37186 from Catfish-Man/missing-dependency

Author: swift-ci

stdlib/public/Darwin/Dispatch/CMakeLists.txt

@@ -18,10 +18,10 @@ add_swift_target_library(swiftDispatch ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES}
 
   SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_OSX _Concurrency Darwin ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_IOS _Concurrency Darwin ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_TVOS _Concurrency Darwin ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_WATCHOS _Concurrency Darwin ObjectiveC # auto-updated
   FRAMEWORK_DEPENDS_WEAK Combine
 
   DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_DISPATCH_OSX}

test/Unit/lit.cfg

@@ -77,3 +77,16 @@ config.test_format = lit.formats.GoogleTest(config.build_mode, 'Tests')
 # module cache for all those tests that do not set that explicitly
 if 'XDG_CACHE_HOME' in os.environ:
   config.environment['XDG_CACHE_HOME'] = os.environ['XDG_CACHE_HOME']
+
+# Find the resource directory.  Assume it's near the swift compiler if not set.
+test_resource_dir = lit_config.params.get('test_resource_dir')
+if not test_resource_dir:
+    test_resource_dir = config.swiftlib_dir
+
+if 'use_os_stdlib' not in lit_config.params:
+    # Ensure we load the libraries from the just built compiler
+    # when building on Darwin
+    # This is needed in addition to what is done in `add_swift_unittest`
+    # to handle dependencies of the dylibs loaded by `SwiftRuntimeTests`
+    # (for which we cannot run `swift-rpathize.py`)
+    config.environment['DYLD_LIBRARY_PATH'] = os.path.join(test_resource_dir, 'macosx')

test/Unit/lit.site.cfg.in

@@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.build_mode = lit_config.params.get('build_mode', "@SWIFT_BUILD_MODE@")
 config.swift_obj_root = "@SWIFT_BINARY_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
+config.swiftlib_dir = "@LIT_SWIFTLIB_DIR@"
 config.swift_test_results_dir = \
     lit_config.params.get("swift_test_results_dir", "@SWIFT_TEST_RESULTS_DIR@")
 

unittests/runtime/CMakeLists.txt

@@ -50,6 +50,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     # some stdlib hooks to implement SwiftObject.
     list(APPEND PLATFORM_TARGET_LINK_LIBRARIES
       ${FOUNDATION_LIBRARY}
+      swift_Concurrency${SWIFT_PRIMARY_VARIANT_SUFFIX}
       swiftStdlibUnittest${SWIFT_PRIMARY_VARIANT_SUFFIX}
       )
   elseif(SWIFT_HOST_VARIANT STREQUAL "Linux")
@@ -129,4 +130,3 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
     ${PLATFORM_TARGET_LINK_LIBRARIES}
     )
 endif()
-