Merge pull request #37587 from lorentey/remove-xctest-overlay

[SDK] Remove the obsolete XCTest overlay

Author: lorentey

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -965,11 +965,6 @@ function(_add_swift_target_library_single target name)
       endif()
     endif()
 
-    # Always use @rpath for XCTest
-    if(module_name STREQUAL "XCTest")
-      set(install_name_dir "@rpath")
-    endif()
-
     if(SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR)
       set(install_name_dir "${SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR}")
     endif()
@@ -1914,9 +1909,7 @@ function(add_swift_target_library name)
       # These paths must come before their normal counterparts so that when compiling
       # macCatalyst-only or unzippered-twin overlays the macCatalyst version
       # of a framework is found and not the Mac version.
-      if(maccatalyst_build_flavor STREQUAL "ios-like"
-          OR (name STREQUAL "swiftXCTest"
-            AND maccatalyst_build_flavor STREQUAL "zippered"))
+      if(maccatalyst_build_flavor STREQUAL "ios-like")
 
         # The path to find iOS-only frameworks (such as UIKit) under macCatalyst.
         set(ios_support_frameworks_path "${SWIFT_SDK_${sdk}_PATH}/System/iOSSupport/System/Library/Frameworks/")

stdlib/public/Darwin/CMakeLists.txt

@@ -19,7 +19,6 @@ set(all_overlays
   Dispatch
   Foundation
   ObjectiveC
-  XCTest
 )
 
 if(DEFINED SWIFT_OVERLAY_TARGETS)