averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[StdlibUnittest] Don't catch ObjC exceptions on non-ObjC platforms.

Browse Source 
My apologies!
This commit is contained in:
Jordan Rose
2016-03-18 14:16:29 -07:00
parent 65c86b713d
commit 86dcce1259
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
View File

@@ -448,12 +448,16 @@ let _crashedPrefix = "CRASHED:"
@_silgen_name("swift_stdlib_installTrapInterceptor") @_silgen_name("swift_stdlib_installTrapInterceptor")
func _stdlib_installTrapInterceptor() func _stdlib_installTrapInterceptor()
#if _runtime(_ObjC)
@objc protocol _StdlibUnittestNSException { @objc protocol _StdlibUnittestNSException {
optional var name: String { get } optional var name: AnyObject { get }
} }
#endif
func _childProcess() { func _childProcess() {
_stdlib_installTrapInterceptor() _stdlib_installTrapInterceptor()
#if _runtime(_ObjC)
objc_setUncaughtExceptionHandler { objc_setUncaughtExceptionHandler {
var stderr = _Stderr() var stderr = _Stderr()
let maybeNSException = unsafeBitCast($0, to:_StdlibUnittestNSException.self) let maybeNSException = unsafeBitCast($0, to:_StdlibUnittestNSException.self)
@@ -466,6 +470,8 @@ func _childProcess() {
to: &stderr) to: &stderr)
} }
} }
#endif
while let line = _stdlib_getline() { while let line = _stdlib_getline() {
let parts = line._split(separator: ";") let parts = line._split(separator: ";")
let testSuiteName = parts[0] let testSuiteName = parts[0]