Merge branch 'main' into jgrynspan/third-party-testing-library-discovery

Author: grynspan

CODEOWNERS .github/CODEOWNERSCODEOWNERS renamed to .github/CODEOWNERS

@@ -18,7 +18,7 @@ on:
 jobs:
   create_merge_pr:
     name: Create PR to merge main into release branch
-    uses: swiftlang/github-workflows/.github/workflows/[email protected].3
+    uses: swiftlang/github-workflows/.github/workflows/[email protected].4
     with:
       head_branch: main
       base_branch: release/6.3

.github/workflows/automerge.yml

@@ -0,0 +1,70 @@
+name: Manual OpenBSD/amd64 build (7.8)
+
+on:
+  workflow_dispatch:
+
+env:
+  META_DATA_CONTENT: |
+      {
+        "instance-id": "iid-local01",
+        "dsmode": "local"
+      }
+  USER_DATA_CONTENT: |
+      #cloud-config
+      timezone: UTC
+      write_files:
+      - content: |
+          set -ex
+          function atexit {
+              echo 1 > /tmp/result
+              tar cvf /dev/sd1c -C /tmp result
+              halt -p;
+          }
+          trap atexit EXIT
+          printf '\033\143'
+          export PATH=/usr/local/bin:$PATH
+          mount /dev/sd3c /mnt
+          cp -r /mnt/repo /home/repo/
+          cd /home/repo/
+          swift test
+          echo $? > /tmp/result
+          tar cvf /dev/sd1c -C /tmp result
+          halt -p
+        path: /etc/rc.local
+        permissions: '0755'
+
+jobs:
+  openbsd:
+    name: OpenBSD
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    container:
+      image: ghcr.io/3405691582/openbsd-swift-amd64:7.8
+      env:
+        CPU: "4"
+        MEM: "16G"
+        KVM: "-enable-kvm"
+      options: --device /dev/kvm
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Write cloud-init files
+        run: |
+            echo "$META_DATA_CONTENT" > /usr/local/share/cidata/meta-data
+            echo "$USER_DATA_CONTENT" > /usr/local/share/cidata/user-data
+
+      - name: Prepare cloud-init
+        run: |
+            cp -r $GITHUB_WORKSPACE /usr/local/share/cidata/repo/ && \
+            cat /usr/local/share/cidata/meta-data && \
+            cat /usr/local/share/cidata/user-data && \
+            ls /usr/local/share/cidata
+
+      - name: Run
+        run: /usr/local/bin/cmd.sh
+
+      - name: Report
+        run: |
+            ls -l /usr/local/share/tape && \
+            exit $(cat /usr/local/share/tape/result)

.github/workflows/manual_build_openbsd.yml

@@ -219,3 +219,14 @@ sufficient information to display the event in a human-readable format.
   ["testID": <test-id>,
     ["testCase": <test-case>]]
 -->
+
+## See Also
+
+### Relevant Swift Evolution proposals
+
+| Proposal Number | Summary | Swift Version | Schema Version |
+|:-|-|-:|-:|
+| [ST-0002](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0002-json-abi.md) | Introduced the initial version of this JSON schema. | 6.0 | `0` |
+| [ST-0009](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0009-attachments.md#integration-with-supporting-tools) | Added attachments. | 6.2 | `0` |
+| [ST-0013](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0013-issue-severity-warning.md#event-stream) | Added test issue severity. | 6.3 | `"6.3"` |
+| [ST-0016](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0016-test-cancellation.md#integration-with-supporting-tools) | Added test cancellation. | 6.3 | `"6.3"` |

Documentation/ABI/JSON.md

@@ -141,7 +141,7 @@ let package = Package(
       ],
       exclude: ["CMakeLists.txt", "Testing.swiftcrossimport"],
       cxxSettings: .packageSettings,
-      swiftSettings: .packageSettings + .enableLibraryEvolution(),
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("Testing"),
       linkerSettings: [
         .linkedLibrary("execinfo", .when(platforms: [.custom("freebsd"), .openbsd]))
       ]
@@ -189,21 +189,15 @@ let package = Package(
         .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
       ],
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + {
-        var result = [PackageDescription.SwiftSetting]()
-
+      swiftSettings: .packageSettings + [
         // The only target which needs the ability to import this macro
         // implementation target's module is its unit test target. Users of the
         // macros this target implements use them via their declarations in the
         // Testing module. This target's module is never distributed to users,
         // but as an additional guard against accidental misuse, this specifies
         // the unit test target as the only allowable client.
-        if buildingForDevelopment {
-          result.append(.unsafeFlags(["-Xfrontend", "-allowable-client", "-Xfrontend", "TestingMacrosTests"]))
-        }
-
-        return result
-      }()
+        .unsafeFlags(["-Xfrontend", "-allowable-client", "-Xfrontend", "TestingMacrosTests"]),
+      ]
     ),
 
     // "Support" targets: These targets are not meant to be used directly by
@@ -218,7 +212,7 @@ let package = Package(
       dependencies: ["_TestingInternals",],
       exclude: ["CMakeLists.txt"],
       cxxSettings: .packageSettings,
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("_TestDiscovery")
     ),
     .target(
       // Build _TestingInterop for debugging/testing purposes only. It is
@@ -228,7 +222,7 @@ let package = Package(
       path: "Sources/_TestingInterop",
       exclude: ["CMakeLists.txt"],
       cxxSettings: .packageSettings,
-      swiftSettings: .packageSettings
+      swiftSettings: .packageSettings + .moduleABIName("_TestingInterop")
     ),
 
     // Cross-import overlays (not supported by Swift Package Manager)
@@ -240,7 +234,7 @@ let package = Package(
       ],
       path: "Sources/Overlays/_Testing_AppKit",
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("Testing")
     ),
     .target(
       name: "_Testing_CoreGraphics",
@@ -249,7 +243,7 @@ let package = Package(
       ],
       path: "Sources/Overlays/_Testing_CoreGraphics",
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("_Testing_CoreGraphics")
     ),
     .target(
       name: "_Testing_CoreImage",
@@ -259,7 +253,7 @@ let package = Package(
       ],
       path: "Sources/Overlays/_Testing_CoreImage",
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("_Testing_CoreImage")
     ),
     .target(
       name: "_Testing_Foundation",
@@ -271,7 +265,7 @@ let package = Package(
       // The Foundation module only has Library Evolution enabled on Apple
       // platforms, and since this target's module publicly imports Foundation,
       // it can only enable Library Evolution itself on those platforms.
-      swiftSettings: .packageSettings + .enableLibraryEvolution(.whenApple())
+      swiftSettings: .packageSettings + .enableLibraryEvolution(.whenApple()) + .moduleABIName("_Testing_Foundation")
     ),
     .target(
       name: "_Testing_UIKit",
@@ -282,7 +276,7 @@ let package = Package(
       ],
       path: "Sources/Overlays/_Testing_UIKit",
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("_Testing_UIKit")
     ),
     .target(
       name: "_Testing_WinSDK",
@@ -291,7 +285,7 @@ let package = Package(
       ],
       path: "Sources/Overlays/_Testing_WinSDK",
       exclude: ["CMakeLists.txt"],
-      swiftSettings: .packageSettings + .enableLibraryEvolution()
+      swiftSettings: .packageSettings + .enableLibraryEvolution() + .moduleABIName("_Testing_WinSDK")
     ),
 
     // Utility targets: These are utilities intended for use when developing
@@ -369,9 +363,9 @@ extension Array where Element == PackageDescription.SwiftSetting {
   static var packageSettings: Self {
     var result = availabilityMacroSettings
 
-    if buildingForDevelopment {
-      result.append(.unsafeFlags(["-require-explicit-sendable"]))
-    }
+#if compiler(>=6.3)
+    result.append(.treatWarning("ExplicitSendable", as: .warning))
+#endif
 
     if buildingForEmbedded {
       result.append(.enableExperimentalFeature("Embedded"))
@@ -391,6 +385,9 @@ extension Array where Element == PackageDescription.SwiftSetting {
       .enableExperimentalFeature("SymbolLinkageMarkers"),
       .enableExperimentalFeature("CompileTimeValuesPreview"),
 
+      // Enabled to allow tests to be added to ~Escapable suites.
+      .enableExperimentalFeature("Lifetimes"),
+
       .enableUpcomingFeature("InferIsolatedConformances"),
 
       // When building as a package, the macro plugin always builds as an
@@ -449,6 +446,30 @@ extension Array where Element == PackageDescription.SwiftSetting {
 
     return result
   }
+
+  /// Create a Swift setting which specifies the module ABI name to use when
+  /// building the target with the specified name.
+  ///
+  /// - Parameters:
+  ///   - targetName The name of the target for which an ABI name should be
+  ///     specified.
+  ///
+  /// - Returns: A Swift setting that specifies the ABI name of the module of
+  ///   the target named `targetName`.
+  ///
+  /// This function simplifies the process of specifying a custom module ABI
+  /// name for various targets in this package. The module ABI name is given a
+  /// suffix for all targets in this package which emit a module that is also
+  /// included in the built-in copy of Swift Testing in Swift toolchains and
+  /// vendor distributions. Without this, there can be runtime collisions; for
+  /// example, on Darwin platforms (where Swift uses the Objective-C runtime),
+  /// a non-generic Swift class type causes a warning from the runtime about
+  /// duplicate class definitions. Specifying a distinct ABI name for each
+  /// module related to Swift Testing loaded into a runner process avoids this
+  /// issue.
+  static func moduleABIName(_ targetName: String) -> Self {
+    [.unsafeFlags(["-module-abi-name", "\(targetName)_package"])]
+  }
 }
 
 extension Array where Element == PackageDescription.CXXSetting {

Package.swift

@@ -36,6 +36,7 @@ extension NSImageRep {
 /// @Metadata {
 ///   @Available(Swift, introduced: 6.3)
 /// }
+@available(_uttypesAPI, *)
 extension NSImage: AttachableAsImage, AttachableAsCGImage {
   /// @Metadata {
   ///   @Available(Swift, introduced: 6.3)
@@ -58,6 +59,10 @@ extension NSImage: AttachableAsImage, AttachableAsCGImage {
     return maxRepWidth ?? 1.0
   }
 
+  public func withUnsafeBytes<R>(as imageFormat: AttachableImageFormat, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+    try withUnsafeBytesImpl(as: imageFormat, body)
+  }
+
   public func _copyAttachableValue() -> Self {
     // If this image is of an NSImage subclass, we cannot reliably make a deep
     // copy of it because we don't know what its `init(data:)` implementation

Sources/Overlays/_Testing_AppKit/Attachments/NSImage+AttachableAsImage.swift

@@ -7,6 +7,7 @@
 # See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  include(ModuleABIName)
   add_library(_Testing_AppKit
     Attachments/NSImage+AttachableAsImage.swift
     ReexportTesting.swift)

Sources/Overlays/_Testing_AppKit/CMakeLists.txt

@@ -74,7 +74,11 @@ extension AttachableAsCGImage {
     1.0
   }
 
-  public func withUnsafeBytes<R>(as imageFormat: AttachableImageFormat, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+  /// The shared implementation of ``AttachableAsImage/withUnsafeBytes(as:_:)``
+  /// used by types that conform to ``AttachableAsCGImage``.
+  ///
+  /// For documentation, see ``AttachableAsImage/withUnsafeBytes(as:_:)``.
+  package func withUnsafeBytesImpl<R>(as imageFormat: AttachableImageFormat, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     let data = NSMutableData()
 
     // Convert the image to a CGImage.

Sources/Overlays/_Testing_CoreGraphics/Attachments/AttachableAsCGImage.swift

@@ -14,12 +14,17 @@ public import CoreGraphics
 /// @Metadata {
 ///   @Available(Swift, introduced: 6.3)
 /// }
+@available(_uttypesAPI, *)
 extension CGImage: AttachableAsImage, AttachableAsCGImage {
   /// @Metadata {
   ///   @Available(Swift, introduced: 6.3)
   /// }
   package var attachableCGImage: CGImage {
     self
   }
+
+  public func withUnsafeBytes<R>(as imageFormat: AttachableImageFormat, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+    try withUnsafeBytesImpl(as: imageFormat, body)
+  }
 }
 #endif

Sources/Overlays/_Testing_CoreGraphics/Attachments/CGImage+AttachableAsImage.swift

@@ -7,6 +7,7 @@
 # See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 if(APPLE)
+  include(ModuleABIName)
   add_library(_Testing_CoreGraphics
     Attachments/AttachableAsCGImage.swift
     Attachments/_AttachableImageWrapper+AttachableWrapper.swift