Enhance NSConditionLock crash test even more

Author: Frizlab

Sources/signal-handling-tests-helper/ConditionLock.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+import ArgumentParser
+
+import SignalHandling
+
+
+
+struct ConditionLock : ParsableCommand {
+	
+	func run() throws {
+		try Sigaction(handler: .ansiC({ _ in ConditionLock.exit() })).install(on: .terminated)
+		
+		NSConditionLock(condition: 0).lock(whenCondition: 1)
+	}
+	
+}

Sources/signal-handling-tests-helper/main.swift

@@ -11,8 +11,11 @@ struct SignalHandlingTestsHelper : ParsableCommand {
 		subcommands: [
 			ManualTest.self,
 			ManualDispatchMemTest.self,
+			
 			DelaySignalBlock.self,
-			DelaySignalUnsigaction.self
+			DelaySignalUnsigaction.self,
+			
+			ConditionLock.self
 		]
 	)
 

Tests/SignalHandlingTests/LockTest.swift

@@ -6,17 +6,23 @@ import XCTest
 final class NSConditionLockTest : XCTestCase {
 
 	func testNSConditionLock() throws {
-		/* https://bugs.swift.org/browse/SR-14676 */
-//		Thread(block: { NSConditionLock(condition: 0).lock(whenCondition: 1) }).start()
-		Thread.sleep(forTimeInterval: 0.1)
-		
-		#if !os(Linux)
-		XCTAssert(true)
-		#else
 		/* Apparently XCTExpectFailure does not exist on Linux. */
+//		#if os(Linux)
 //		XCTExpectFailure("Linux has a crash in NSConditionLock. This test is only here to remember to check if the bug is fixed from time to time (simply uncomment the second line of the test; if test does not crash on Linux we’re good).")
-		XCTAssert(false, "Linux has a crash in NSConditionLock. This test is only here to remember to check if the bug is fixed from time to time (simply uncomment the second line of the test; if test does not crash on Linux we’re good).")
-		#endif
+//		#endif
+		
+		let p = Process()
+		p.executableURL = Utils.helperURL
+		p.arguments = ["condition-lock"]
+		
+		try p.run()
+		
+		Thread.sleep(forTimeInterval: 0.125) /* We wait a little bit to let the helper test have the time to crash */
+		p.terminate()
+		Thread.sleep(forTimeInterval: 0.125) /* We wait a little bit to let the helper test process the signal and quit */
+		
+		XCTAssertEqual(p.terminationStatus, 0)
+		XCTAssertEqual(p.terminationReason, .exit)
 	}
 
 }

Tests/SignalHandlingTests/SignalHandlingTests.swift

@@ -11,8 +11,6 @@ import Logging
 @available(OSX 10.15.4, *)
 final class SignalHandlingTests : XCTestCase {
 
-	static let helperURL = productsDirectory.appendingPathComponent("signal-handling-tests-helper")
-	
 	override class func setUp() {
 		super.setUp()
 
@@ -27,7 +25,7 @@ final class SignalHandlingTests : XCTestCase {
 
 		let p = Process()
 		p.standardOutput = pipe
-		p.executableURL = Self.helperURL
+		p.executableURL = Utils.helperURL
 		p.arguments = ["delay-signal-unsigaction", "--signal-number", "\(Signal.terminated.rawValue)"]
 
 		try p.run()
@@ -53,7 +51,7 @@ final class SignalHandlingTests : XCTestCase {
 
 		let p = Process()
 		p.standardOutput = pipe
-		p.executableURL = Self.helperURL
+		p.executableURL = Utils.helperURL
 		p.arguments = ["delay-signal-block", "--signal-number", "\(Signal.terminated.rawValue)"]
 
 		try p.run()
@@ -74,16 +72,4 @@ final class SignalHandlingTests : XCTestCase {
 			""".utf8))
 	}
 
-	/** Returns the path to the built products directory. */
-	private static var productsDirectory: URL {
-		#if os(macOS)
-		for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") {
-			return bundle.bundleURL.deletingLastPathComponent()
-		}
-		fatalError("couldn't find the products directory")
-		#else
-		return Bundle.main.bundleURL
-		#endif
-	}
-	
 }

Tests/SignalHandlingTests/Utils.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+
+
+enum Utils {
+	
+	static let helperURL = productsDirectory.appendingPathComponent("signal-handling-tests-helper")
+	
+	/** Returns the path to the built products directory. */
+	private static var productsDirectory: URL {
+		#if os(macOS)
+		for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") {
+			return bundle.bundleURL.deletingLastPathComponent()
+		}
+		fatalError("couldn't find the products directory")
+		#else
+		return Bundle.main.bundleURL
+		#endif
+	}
+	
+}