Merge branch 'main' into jgrynspan/1371-section-used-attributes

Author: grynspan

Sources/Overlays/_Testing_CoreGraphics/Attachments/AttachableImageFormat+UTType.swift

@@ -11,6 +11,9 @@
 #if SWT_TARGET_OS_APPLE && canImport(CoreGraphics)
 public import UniformTypeIdentifiers
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 @available(_uttypesAPI, *)
 extension AttachableImageFormat {
   /// The content type corresponding to this image format.

Sources/Overlays/_Testing_CoreGraphics/Attachments/_AttachableImageWrapper+AttachableWrapper.swift

@@ -13,6 +13,9 @@ private import CoreGraphics
 
 private import UniformTypeIdentifiers
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 @available(_uttypesAPI, *)
 extension _AttachableImageWrapper: Attachable, AttachableWrapper where Image: AttachableAsImage {
   /// Get the image format to use when encoding an image, substituting a
@@ -47,11 +50,17 @@ extension _AttachableImageWrapper: Attachable, AttachableWrapper where Image: At
     return encodingQuality < 1.0 ? .jpeg : .png
   }
 
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public func withUnsafeBytes<R>(for attachment: borrowing Attachment<_AttachableImageWrapper>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     let imageFormat = _imageFormat(forPreferredName: attachment.preferredName)
     return try wrappedValue.withUnsafeBytes(as: imageFormat, body)
   }
 
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public borrowing func preferredName(for attachment: borrowing Attachment<_AttachableImageWrapper>, basedOn suggestedName: String) -> String {
     let imageFormat = _imageFormat(forPreferredName: suggestedName)
     return (suggestedName as NSString).appendingPathExtension(for: imageFormat.contentType)

Sources/Overlays/_Testing_Foundation/Attachments/Attachment+URL.swift

@@ -121,14 +121,14 @@ private let _archiverPath: String? = {
     return nil
   }
 
-  return withUnsafeTemporaryAllocation(of: wchar_t.self, capacity: Int(bufferCount)) { buffer -> String? in
+  return withUnsafeTemporaryAllocation(of: CWideChar.self, capacity: Int(bufferCount)) { buffer -> String? in
     let bufferCount = GetSystemDirectoryW(buffer.baseAddress!, UINT(buffer.count))
     guard bufferCount > 0 && bufferCount < buffer.count else {
       return nil
     }
 
     return _archiverName.withCString(encodedAs: UTF16.self) { archiverName -> String? in
-      var result: UnsafeMutablePointer<wchar_t>?
+      var result: UnsafeMutablePointer<CWideChar>?
 
       let flags = ULONG(PATHCCH_ALLOW_LONG_PATHS.rawValue)
       guard S_OK == PathAllocCombine(buffer.baseAddress!, archiverName, flags, &result) else {

Sources/Overlays/_Testing_WinSDK/Attachments/AttachableImageFormat+CLSID.swift

@@ -11,6 +11,9 @@
 #if os(Windows)
 public import WinSDK
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 extension AttachableImageFormat {
   private static let _encoderPathExtensionsByCLSID = Result {
     var result = [CLSID.Wrapper: [String]]()

Sources/Overlays/_Testing_WinSDK/Attachments/_AttachableImageWrapper+AttachableWrapper.swift

@@ -11,6 +11,9 @@
 #if os(Windows)
 private import WinSDK
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 extension _AttachableImageWrapper: Attachable, AttachableWrapper where Image: AttachableAsImage {
   /// Get the image format to use when encoding an image.
   ///
@@ -38,11 +41,17 @@ extension _AttachableImageWrapper: Attachable, AttachableWrapper where Image: At
     return encodingQuality < 1.0 ? .jpeg : .png
   }
 
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public func withUnsafeBytes<R>(for attachment: borrowing Attachment<_AttachableImageWrapper>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     let imageFormat = _imageFormat(forPreferredName: attachment.preferredName)
     return try wrappedValue.withUnsafeBytes(as: imageFormat, body)
   }
 
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public borrowing func preferredName(for attachment: borrowing Attachment<_AttachableImageWrapper>, basedOn suggestedName: String) -> String {
     let imageFormat = _imageFormat(forPreferredName: suggestedName)
     return AttachableImageFormat.appendPathExtension(for: imageFormat.encoderCLSID, to: suggestedName)

Sources/Testing/ABI/EntryPoints/EntryPoint.swift

@@ -210,6 +210,9 @@ public struct __CommandLineArguments_v0: Sendable {
   /// The value of the `--parallel` or `--no-parallel` argument.
   public var parallel: Bool?
 
+  /// The maximum number of test tasks to run in parallel.
+  public var experimentalMaximumParallelizationWidth: Int?
+
   /// The value of the `--symbolicate-backtraces` argument.
   public var symbolicateBacktraces: String?
 
@@ -336,6 +339,7 @@ extension __CommandLineArguments_v0: Codable {
   enum CodingKeys: String, CodingKey {
     case listTests
     case parallel
+    case experimentalMaximumParallelizationWidth
     case symbolicateBacktraces
     case verbose
     case veryVerbose
@@ -485,6 +489,10 @@ func parseCommandLineArguments(from args: [String]) throws -> __CommandLineArgum
   if args.contains("--no-parallel") {
     result.parallel = false
   }
+  if let maximumParallelizationWidth = args.argumentValue(forLabel: "--experimental-maximum-parallelization-width").flatMap(Int.init) {
+    // TODO: decide if we want to repurpose --num-workers for this use case?
+    result.experimentalMaximumParallelizationWidth = maximumParallelizationWidth
+  }
 
   // Whether or not to symbolicate backtraces in the event stream.
   if let symbolicateBacktraces = args.argumentValue(forLabel: "--symbolicate-backtraces") {
@@ -545,7 +553,22 @@ public func configurationForEntryPoint(from args: __CommandLineArguments_v0) thr
   var configuration = Configuration()
 
   // Parallelization (on by default)
-  configuration.isParallelizationEnabled = args.parallel ?? true
+  if let parallel = args.parallel, !parallel {
+    configuration.isParallelizationEnabled = parallel
+  } else {
+    var maximumParallelizationWidth = args.experimentalMaximumParallelizationWidth
+    if maximumParallelizationWidth == nil && Test.current == nil {
+      // Don't check the environment variable when a current test is set (which
+      // presumably means we're running our own unit tests).
+      maximumParallelizationWidth = Environment.variable(named: "SWT_EXPERIMENTAL_MAXIMUM_PARALLELIZATION_WIDTH").flatMap(Int.init)
+    }
+    if let maximumParallelizationWidth {
+      if maximumParallelizationWidth < 1 {
+        throw _EntryPointError.invalidArgument("--experimental-maximum-parallelization-width", value: String(describing: maximumParallelizationWidth))
+      }
+      configuration.maximumParallelizationWidth = maximumParallelizationWidth
+    }
+  }
 
   // Whether or not to symbolicate backtraces in the event stream.
   if let symbolicateBacktraces = args.symbolicateBacktraces {

Sources/Testing/Attachments/Images/AttachableAsImage.swift

@@ -81,6 +81,10 @@ public protocol AttachableAsImage {
   /// The testing library uses this function when saving an image as an
   /// attachment. The implementation should use `imageFormat` to determine what
   /// encoder to use.
+  ///
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   borrowing func withUnsafeBytes<R>(as imageFormat: AttachableImageFormat, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R
 
   /// Make a copy of this instance to pass to an attachment.

Sources/Testing/Attachments/Images/AttachableImageFormat.swift

@@ -79,6 +79,9 @@ public struct AttachableImageFormat: Sendable {
 
 // MARK: - Equatable, Hashable
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 #if SWT_NO_IMAGE_ATTACHMENTS
 @_unavailableInEmbedded
 @available(*, unavailable, message: "Image attachments are not available on this platform.")
@@ -120,12 +123,18 @@ extension AttachableImageFormat.Kind: Equatable, Hashable {
 
 // MARK: - CustomStringConvertible, CustomDebugStringConvertible
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 #if SWT_NO_IMAGE_ATTACHMENTS
 @_unavailableInEmbedded
 @available(*, unavailable, message: "Image attachments are not available on this platform.")
 #endif
 @available(_uttypesAPI, *)
 extension AttachableImageFormat: CustomStringConvertible, CustomDebugStringConvertible {
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public var description: String {
     let kindDescription = String(describing: kind)
     if encodingQuality < 1.0 {
@@ -134,6 +143,9 @@ extension AttachableImageFormat: CustomStringConvertible, CustomDebugStringConve
     return kindDescription
   }
 
+  /// @Metadata {
+  ///   @Available(Swift, introduced: 6.3)
+  /// }
   public var debugDescription: String {
     let kindDescription = String(reflecting: kind)
     return "\(kindDescription) at quality \(encodingQuality)"
@@ -142,6 +154,9 @@ extension AttachableImageFormat: CustomStringConvertible, CustomDebugStringConve
 
 // MARK: -
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 #if SWT_NO_IMAGE_ATTACHMENTS
 @_unavailableInEmbedded
 @available(*, unavailable, message: "Image attachments are not available on this platform.")

Sources/Testing/Attachments/Images/Attachment+AttachableAsImage.swift

@@ -8,6 +8,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
+/// @Metadata {
+///   @Available(Swift, introduced: 6.3)
+/// }
 #if SWT_NO_IMAGE_ATTACHMENTS
 @_unavailableInEmbedded
 @available(*, unavailable, message: "Image attachments are not available on this platform.")

Sources/Testing/CMakeLists.txt

@@ -90,6 +90,7 @@ add_library(Testing
   Support/Graph.swift
   Support/JSON.swift
   Support/Locked.swift
+  Support/Serializer.swift
   Support/VersionNumber.swift
   Support/Versions.swift
   Discovery+Macro.swift