Merge branch 'main' into jgrynspan/promote-windows-image-attachments-to-api

Author: grynspan

Sources/Testing/Events/Recorder/Event.AdvancedConsoleOutputRecorder.swift

@@ -142,8 +142,8 @@ extension Event {
     /// The write function for this recorder.
     let write: @Sendable (String) -> Void
 
-    /// The fallback console recorder for standard output.
-    private let _fallbackRecorder: Event.ConsoleOutputRecorder
+    /// The base console output options.
+    private let _baseOptions: Event.ConsoleOutputRecorder.Options
 
     /// Context storage for test information and results.
     private let _context: Locked<_Context>
@@ -159,7 +159,7 @@ extension Event {
     init(options: Options = Options(), writingUsing write: @escaping @Sendable (String) -> Void) {
       self.options = options
       self.write = write
-      self._fallbackRecorder = Event.ConsoleOutputRecorder(options: options.base, writingUsing: write)
+      self._baseOptions = options.base
       self._context = Locked(rawValue: _Context())
       self._humanReadableRecorder = Event.HumanReadableOutputRecorder()
     }
@@ -258,7 +258,7 @@ extension Event.AdvancedConsoleOutputRecorder {
     // The hierarchical summary will be shown at the end
     switch eventKind {
     case .runStarted:
-      let symbol = Event.Symbol.default.stringValue(options: _fallbackRecorder.options)
+      let symbol = Event.Symbol.default.stringValue(options: _baseOptions)
       write("\(symbol) Test run started.\n")
 
     case .runEnded:

Sources/Testing/Events/Recorder/Event.HumanReadableOutputRecorder.swift

@@ -361,7 +361,7 @@ extension Event.HumanReadableOutputRecorder {
           comments.append("Swift Standard Library Version: \(swiftStandardLibraryVersion)")
         }
         comments.append("Swift Compiler Version: \(swiftCompilerVersion)")
-#if canImport(Glibc) && !os(FreeBSD) && !os(OpenBSD)
+#if os(Linux) && canImport(Glibc)
         comments.append("GNU C Library Version: \(glibcVersion)")
 #endif
       }

Sources/Testing/ExitTests/ExitStatus.swift

@@ -121,6 +121,7 @@ extension ExitStatus: CustomStringConvertible {
       var signalName: String?
 
 #if SWT_TARGET_OS_APPLE || os(FreeBSD) || os(OpenBSD) || os(Android)
+#if !SWT_NO_SYS_SIGNAME
       // These platforms define sys_signame with a size, which is imported
       // into Swift as a tuple.
       withUnsafeBytes(of: sys_signame) { sys_signame in
@@ -130,6 +131,7 @@ extension ExitStatus: CustomStringConvertible {
           }
         }
       }
+#endif
 #elseif os(Linux)
 #if !SWT_NO_DYNAMIC_LINKING
       signalName = _sigabbrev_np?(signal).flatMap(String.init(validatingCString:))

Sources/Testing/ExitTests/SpawnProcess.swift

@@ -113,6 +113,13 @@ func spawnExecutable(
       withUnsafeTemporaryAllocation(of: sigset_t.self, capacity: 1) { allSignals in
         let allSignals = allSignals.baseAddress!
         sigfillset(allSignals)
+#if os(OpenBSD)
+        // On OpenBSD, attempting to set the signal handler for SIGKILL or
+        // SIGSTOP will cause the child process of a call to posix_spawn() to
+        // exit abnormally with exit code 127. See https://man.openbsd.org/sigaction.2#ERRORS
+        sigdelset(allSignals, SIGKILL)
+        sigdelset(allSignals, SIGSTOP)
+#endif
         posix_spawnattr_setsigdefault(attrs, allSignals);
         flags |= CShort(POSIX_SPAWN_SETSIGDEF)
       }
@@ -137,7 +144,7 @@ func spawnExecutable(
             // standardized in POSIX.1-2024 (see https://pubs.opengroup.org/onlinepubs/9799919799/functions/posix_spawn_file_actions_adddup2.html
             // and https://www.austingroupbugs.net/view.php?id=411).
             _ = posix_spawn_file_actions_adddup2(fileActions, fd, fd)
-#if canImport(Glibc) && !os(FreeBSD) && !os(OpenBSD)
+#if os(Linux) && canImport(Glibc)
             if _slowPath(glibcVersion < VersionNumber(2, 29)) {
               // This system is using an older version of glibc that does not
               // implement FD_CLOEXEC clearing in posix_spawn_file_actions_adddup2(),

Sources/Testing/ExitTests/WaitFor.swift

@@ -85,11 +85,7 @@ private let _childProcessContinuations = LockedWith<pthread_mutex_t, [pid_t: Che
 /// A condition variable used to suspend the waiter thread created by
 /// `_createWaitThread()` when there are no child processes to await.
 private nonisolated(unsafe) let _waitThreadNoChildrenCondition = {
-#if os(FreeBSD) || os(OpenBSD)
-  let result = UnsafeMutablePointer<pthread_cond_t?>.allocate(capacity: 1)
-#else
   let result = UnsafeMutablePointer<pthread_cond_t>.allocate(capacity: 1)
-#endif
   _ = pthread_cond_init(result, nil)
   return result
 }()

Sources/Testing/Support/Locked+Platform.swift

@@ -39,9 +39,10 @@ extension os_unfair_lock_s: Lockable {
 
 #if os(FreeBSD) || os(OpenBSD)
 typealias pthread_mutex_t = _TestingInternals.pthread_mutex_t?
+typealias pthread_cond_t = _TestingInternals.pthread_cond_t?
 #endif
 
-#if SWT_TARGET_OS_APPLE || os(Linux) || os(Android) || (os(WASI) && _runtime(_multithreaded)) || os(FreeBSD) || os(OpenBSD)
+#if SWT_TARGET_OS_APPLE || os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android) || (os(WASI) && _runtime(_multithreaded))
 extension pthread_mutex_t: Lockable {
   static func initializeLock(at lock: UnsafeMutablePointer<Self>) {
     _ = pthread_mutex_init(lock, nil)
@@ -83,7 +84,7 @@ extension SRWLOCK: Lockable {
 
 #if SWT_TARGET_OS_APPLE && !SWT_NO_OS_UNFAIR_LOCK
 typealias DefaultLock = os_unfair_lock
-#elseif SWT_TARGET_OS_APPLE || os(Linux) || os(Android) || (os(WASI) && _runtime(_multithreaded)) || os(FreeBSD) || os(OpenBSD)
+#elseif SWT_TARGET_OS_APPLE || os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android) || (os(WASI) && _runtime(_multithreaded))
 typealias DefaultLock = pthread_mutex_t
 #elseif os(Windows)
 typealias DefaultLock = SRWLOCK

Sources/Testing/Support/Versions.swift

@@ -198,7 +198,7 @@ var swiftCompilerVersion: VersionNumber {
   )
 }
 
-#if canImport(Glibc) && !os(FreeBSD) && !os(OpenBSD)
+#if os(Linux) && canImport(Glibc)
 /// The (runtime, not compile-time) version of glibc in use on this system.
 ///
 /// This value is not part of the public interface of the testing library.

Tests/TestingTests/ABIEntryPointTests.swift

@@ -67,12 +67,12 @@ struct ABIEntryPointTests {
     passing arguments: __CommandLineArguments_v0,
     recordHandler: @escaping @Sendable (_ recordJSON: UnsafeRawBufferPointer) -> Void = { _ in }
   ) async throws -> Bool {
-#if !os(Linux) && !os(FreeBSD) && !os(Android) && !SWT_NO_DYNAMIC_LINKING
+#if !(os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android)) && !SWT_NO_DYNAMIC_LINKING
     // Get the ABI entry point by dynamically looking it up at runtime.
     //
-    // NOTE: The standard Linux linker does not allow exporting symbols from
-    // executables, so dlsym() does not let us find this function on that
-    // platform when built as an executable rather than a dynamic library.
+    // NOTE: The standard linkers on these platforms do not export symbols from
+    // executables, so dlsym() does not let us find this function on these
+    // platforms when built as an executable rather than a dynamic library.
     let abiv0_getEntryPoint = try withTestingLibraryImageAddress { testingLibrary in
       try #require(
         symbol(in: testingLibrary, named: "swt_abiv0_getEntryPoint").map {
@@ -187,8 +187,9 @@ private func withTestingLibraryImageAddress<R>(_ body: (ImageAddress?) throws ->
   defer {
     dlclose(testingLibraryAddress)
   }
-#elseif os(Linux) || os(FreeBSD) || os(Android)
-  // When using glibc, dladdr() is only available if __USE_GNU is specified.
+#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(Android)
+  // We can't dynamically look up a function linked into the test executable on
+  // ELF-based platforms.
 #elseif os(Windows)
   let flags = DWORD(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)
   try addressInTestingLibrary.withMemoryRebound(to: wchar_t.self, capacity: MemoryLayout<UnsafeRawPointer>.stride / MemoryLayout<wchar_t>.stride) { addressInTestingLibrary in

Tests/TestingTests/AdvancedConsoleOutputRecorderTests.swift

@@ -8,7 +8,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
+#if canImport(Foundation)
 @testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
+import Foundation
 
 @Suite("Advanced Console Output Recorder Tests")
 struct AdvancedConsoleOutputRecorderTests {
@@ -237,3 +239,4 @@ struct SimpleTestSuite {
     #expect(Bool(true))
   }
 } 
+#endif

Tests/TestingTests/ExitTestTests.swift

@@ -16,7 +16,9 @@ private import _TestingInternals
   @Test("Signal names are reported (where supported)") func signalName() {
     var hasSignalNames = false
 #if SWT_TARGET_OS_APPLE || os(FreeBSD) || os(OpenBSD) || os(Android)
+#if !SWT_NO_SYS_SIGNAME
     hasSignalNames = true
+#endif
 #elseif os(Linux) && !SWT_NO_DYNAMIC_LINKING
     hasSignalNames = (symbol(named: "sigabbrev_np") != nil)
 #endif