Skip to content

Commit 9cf28df

Browse files
committed
[SDK] Remove the obsolete XCTest overlay
The actual XCTest overlay has not been maintained in this repository for years. (It is distributed in Xcode (libXCTestSwiftSupport.dylib), along with XCTest.framework itself.) The code we have here is badly out of date, and the fact that we have it on the module path in CI makes it interfere with the contents of recent SDKs. Remove the XCTest overlay from this repository; pick it up from the SDK instead. rdar://76915582
1 parent 4fc7fc3 commit 9cf28df

File tree

8 files changed

+2
-1506
lines changed

8 files changed

+2
-1506
lines changed

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -965,11 +965,6 @@ function(_add_swift_target_library_single target name)
965965
endif()
966966
endif()
967967

968-
# Always use @rpath for XCTest
969-
if(module_name STREQUAL "XCTest")
970-
set(install_name_dir "@rpath")
971-
endif()
972-
973968
if(SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR)
974969
set(install_name_dir "${SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR}")
975970
endif()
@@ -1914,9 +1909,7 @@ function(add_swift_target_library name)
19141909
# These paths must come before their normal counterparts so that when compiling
19151910
# macCatalyst-only or unzippered-twin overlays the macCatalyst version
19161911
# of a framework is found and not the Mac version.
1917-
if(maccatalyst_build_flavor STREQUAL "ios-like"
1918-
OR (name STREQUAL "swiftXCTest"
1919-
AND maccatalyst_build_flavor STREQUAL "zippered"))
1912+
if(maccatalyst_build_flavor STREQUAL "ios-like")
19201913

19211914
# The path to find iOS-only frameworks (such as UIKit) under macCatalyst.
19221915
set(ios_support_frameworks_path "${SWIFT_SDK_${sdk}_PATH}/System/iOSSupport/System/Library/Frameworks/")

stdlib/public/Darwin/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ set(all_overlays
1919
Dispatch
2020
Foundation
2121
ObjectiveC
22-
XCTest
2322
)
2423

2524
if(DEFINED SWIFT_OVERLAY_TARGETS)

stdlib/public/Darwin/XCTest/CMakeLists.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)