Skip to content

Tweaks to some feature conditionals. #129

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 1 commit into from
Nov 20, 2023
Merged

Tweaks to some feature conditionals. #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Sources/Testing/Events/Clock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ extension SuspendingClock.Instant {
}
}

#if !SWT_NO_UTC_CLOCK
@_spi(ExperimentalEventHandling)
extension Test.Clock.Instant {
#if !SWT_NO_UTC_CLOCK
/// The duration since 1970 represented by this instance as a tuple of seconds
/// and attoseconds.
///
Expand All @@ -93,6 +93,7 @@ extension Test.Clock.Instant {
public var durationSince1970: Duration {
Duration(wall)
}
#endif

/// Get the number of nanoseconds from this instance to another.
///
Expand All @@ -110,7 +111,6 @@ extension Test.Clock.Instant {
return otherNanoseconds - selfNanoseconds
}
}
#endif

// MARK: - Sleeping

Expand Down
6 changes: 6 additions & 0 deletions Sources/Testing/Running/EntryPoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ func configurationForSwiftPMEntryPoint(withArguments args: [String]) throws -> C
configuration.isParallelizationEnabled = true
}

#if !SWT_NO_FILE_IO
// XML output
if let xunitOutputIndex = args.firstIndex(of: "--xunit-output"), xunitOutputIndex < args.endIndex {
let xunitOutputPath = args[args.index(after: xunitOutputIndex)]
Expand Down Expand Up @@ -167,6 +168,7 @@ func configurationForSwiftPMEntryPoint(withArguments args: [String]) throws -> C
oldEventHandler(event, context)
}
}
#endif

// Filtering
// NOTE: Regex is not marked Sendable, but because the regexes we use are
Expand Down Expand Up @@ -232,6 +234,7 @@ extension [Event.ConsoleOutputRecorder.Option] {
static var forStandardError: Self {
var result = Self()

#if !SWT_NO_FILE_IO
let useANSIEscapeCodes = _standardErrorSupportsANSIEscapeCodes
if useANSIEscapeCodes {
result.append(.useANSIEscapeCodes)
Expand Down Expand Up @@ -263,10 +266,12 @@ extension [Event.ConsoleOutputRecorder.Option] {
if let tagColors = try? loadTagColors() {
result.append(.useTagColors(tagColors))
}
#endif

return result
}

#if !SWT_NO_FILE_IO
/// Whether or not the current process's standard error stream is capable of
/// accepting and rendering ANSI escape codes.
private static var _standardErrorSupportsANSIEscapeCodes: Bool {
Expand Down Expand Up @@ -325,4 +330,5 @@ extension [Event.ConsoleOutputRecorder.Option] {
true
#endif
}
#endif
}
8 changes: 2 additions & 6 deletions Sources/Testing/Traits/Tag.Color+Loading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private import TestingInternals
private import Foundation
#endif

#if !SWT_NO_TAG_COLORS
#if !SWT_NO_FILE_IO
#if os(macOS) || (os(iOS) && targetEnvironment(macCatalyst)) || os(Linux)
/// The path to the current user's home directory, if known.
private var _homeDirectoryPath: String? {
Expand Down Expand Up @@ -69,7 +69,6 @@ var swiftTestingDirectoryPath: String {
#endif
return ""
}
#endif

/// Read tag colors out of the file `"tag-colors.json"` in a given directory.
///
Expand All @@ -88,7 +87,6 @@ var swiftTestingDirectoryPath: String {
/// string values and the values represent tag colors. For a list of the
/// supported formats for tag colors in this dictionary, see <doc:AddingTags>.
func loadTagColors(fromFileInDirectoryAtPath swiftTestingDirectoryPath: String = swiftTestingDirectoryPath) throws -> [Tag: Tag.Color] {
#if !SWT_NO_TAG_COLORS && canImport(Foundation)
// Find the path to the tag-colors.json file and try to load its contents.
let tagColorsURL = URL(fileURLWithPath: swiftTestingDirectoryPath, isDirectory: true)
.appendingPathComponent("tag-colors.json", isDirectory: false)
Expand All @@ -103,7 +101,5 @@ func loadTagColors(fromFileInDirectoryAtPath swiftTestingDirectoryPath: String =
// as an actual tag color, so we have a step here that filters it.
return try JSONDecoder().decode([Tag: Tag.Color?].self, from: tagColorsData)
.compactMapValues { $0 }
#else
[]
#endif
}
#endif
2 changes: 1 addition & 1 deletion Tests/TestingTests/Traits/TagListTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ struct TagListTests {
#expect(tagSourceCode.contains { String(describing: $0) == "Tag.functionCall(\"abc\")" })
}

#if !SWT_NO_TAG_COLORS && canImport(Foundation)
#if !SWT_NO_FILE_IO
@Test(
"Colors are read from disk",
.tags("alpha", "beta", "gamma", "delta", .namedConstant)
Expand Down