Skip to content

Run CI tests on Mac Catalyst. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 22, 2021
Merged

Run CI tests on Mac Catalyst. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd0dccc
Run CI tests on Mac Catalyst.
mbrandonw Sep 21, 2021
551e812
Merge remote-tracking branch 'origin/main' into mac-catalyst-tests
mbrandonw Sep 21, 2021
833d107
fix windows
mbrandonw Sep 21, 2021
3c91372
fix test
mbrandonw Sep 21, 2021
816c050
wip
stephencelis Sep 22, 2021
147a0de
Merge remote-tracking branch 'origin/main' into mac-catalyst-tests
stephencelis Sep 22, 2021
10aae52
wip
stephencelis Sep 22, 2021
c152b94
wip
stephencelis Sep 22, 2021
c1506f0
test
stephencelis Sep 22, 2021
2fc8ec9
fix
stephencelis Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
PLATFORM_MACOS = macOS
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
PLATFORM_TVOS = tvOS Simulator,name=Apple TV 4K (at 1080p)
PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 4 - 44mm

Expand Down Expand Up @@ -36,6 +37,14 @@ test-platforms:
-configuration Release \
-destination platform="$(PLATFORM_MACOS)"

xcodebuild test \
-scheme swift-custom-dump \
-destination platform="$(PLATFORM_MAC_CATALYST)"
xcodebuild \
-scheme swift-custom-dump \
-configuration Release \
-destination platform="$(PLATFORM_MAC_CATALYST)"

xcodebuild test \
-scheme swift-custom-dump \
-destination platform="$(PLATFORM_TVOS)"
Expand Down
24 changes: 15 additions & 9 deletions Tests/CustomDumpTests/DumpTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,12 +715,6 @@ final class DumpTests: XCTestCase {
)
}

class SubclassedError: NSError {}

enum BridgedError: Error {
case thisIsFine(Int)
}

func testFoundation() {
var dump = ""

Expand Down Expand Up @@ -932,6 +926,9 @@ final class DumpTests: XCTestCase {
"""
)

#if !os(Windows)
class SubclassedError: NSError {}

dump = ""
customDump(
SubclassedError(
Expand All @@ -955,23 +952,32 @@ final class DumpTests: XCTestCase {
)
"""
)
#endif

enum BridgedError: Error {
case thisIsFine(Int)
}

dump = ""
customDump(BridgedError.thisIsFine(94) as NSError, to: &dump)
#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
XCTAssertNoDifference(
dump,
"""
DumpTests.BridgedError.thisIsFine(94)
DumpTests.(unknown context).(unknown context).BridgedError.thisIsFine(94)
"""
)
#else
// Can't unwrap bridged Errors on Linux: https://bugs.swift.org/browse/SR-15191
XCTAssertNoDifference(
dump,
dump.replacingOccurrences(
of: #"\(unknown context at \$[[:xdigit:]]+\)"#,
with: "(unknown context)",
options: .regularExpression
),
"""
NSError(
domain: "CustomDumpTests.DumpTests.BridgedError",
domain: "CustomDumpTests.DumpTests.(unknown context).(unknown context).BridgedError",
code: 0,
userInfo: [:]
)
Expand Down