Skip to content

Compile fixes for FreeBSD - #251

Merged
gwynne merged 1 commit into
vapor:mainfrom
hoanga:freebsd-support
Nov 13, 2026
Merged

gwynne merged 1 commit into
vapor:mainfrom
hoanga:freebsd-support

Conversation

@hoanga

@hoanga hoanga commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

These changes are now available in 5.0.0-beta.4

FreeBSD uses the Darwin-compatible sigaction layout

(__sigaction_u.__sa_handler) and has native TCSASOFT.

Extend the Linux readpassphrase implementation to cover FreeBSD so linux_readpassphrase is available when needed.

Sample Build Run:

$ uname -a
FreeBSD nori 15.1-RELEASE-p5 FreeBSD 15.1-RELEASE-p5 releng/15.1-n283639-893c7c99b60d GENERIC amd64

$ swift -version
Swift version 6.5-dev (LLVM 323c7575daad203, Swift fa911731cf90e3d)
Target: x86_64-unknown-freebsd14.3
Build config: +assertions

$ swift build
Building for debugging...
[Using on-disk description]

Build complete! (2.41 secs)

$ swift test
Building for debugging...
[Using on-disk description]

Build complete! (2.50 secs)
Test Suite 'All tests' started at 2026-11-12 21:49:35.609
Test Suite 'Debug-freebsd-x86_64.xctest' started at 2026-11-12 21:49:35.620
Test Suite 'Debug-freebsd-x86_64.xctest' passed at 2026-11-12 21:49:35.620
         Executed 0 tests, with 0 failures (0 unexpected) in 0.0 (0.0) seconds
Test Suite 'All tests' passed at 2026-11-12 21:49:35.620
         Executed 0 tests, with 0 failures (0 unexpected) in 0.0 (0.0) seconds
Test Suite 'All tests' started at 2026-11-12 21:49:35.638
Test Suite 'Debug-freebsd-x86_64.xctest' started at 2026-11-12 21:49:35.644
Test Suite 'Debug-freebsd-x86_64.xctest' passed at 2026-11-12 21:49:35.644
         Executed 0 tests, with 0 failures (0 unexpected) in 0.0 (0.0) seconds
Test Suite 'All tests' passed at 2026-11-12 21:49:35.644
         Executed 0 tests, with 0 failures (0 unexpected) in 0.0 (0.0) seconds
◇ Test run started.
↳ Testing Library Version: 6.5-dev (da2894961b77431)
↳ Target Platform: x86_64-unknown-freebsd
◇ Suite "ConsoleLogger Tests" started.
◇ Suite "LoggerFragmentBuilder Tests" started.
◇ Test "Log Handler Check" started.
◇ Test "Metadata Providers" started.
◇ Test "Conditional Fragment" started.
◇ Test "Empty Block" started.
◇ Test "Timestamp Fragment" started.
◇ Test "Default built with LoggerFragmentBuilder" started.
◇ Test "Array Fragment" started.
◇ Test "Source Fragment" started.
◇ Test "Metadata" started.
◇ Test "Empty separator does not consume needsSeparator" started.
◇ Test "Error Metadata Fragment" started.
◇ Test "Simple Fragment" started.
◇ Test "LoggerFragmentBuilder with zero spaces" started.
◇ Test "LoggerFragmentBuilder" started.
◇ Test "Complex Conditional Fragment" started.
◇ Test "Log Level from ConfigReader" started.
◇ Test "Error" started.
◇ Test "Source Location" started.
◇ Test "Logging Levels" started.
◇ Test case passing 1 argument includeTimestamp → false to "Conditional Fragment" started.
◇ Test case passing 1 argument includeTimestamp → true to "Conditional Fragment" started.
◇ Test case passing 1 argument level → error to "Complex Conditional Fragment" started.
◇ Test case passing 1 argument level → trace to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → warning to "Complex Conditional Fragment" started.
◇ Test case passing 1 argument level → info to "Complex Conditional Fragment" started.
✔ Test "Log Handler Check" passed after 0.002 seconds.
✔ Test "Conditional Fragment" with 2 test cases passed after 0.002 seconds.
✔ Test "Empty Block" passed after 0.002 seconds.
✔ Test "Array Fragment" passed after 0.002 seconds.
✔ Test "Metadata" passed after 0.002 seconds.
✔ Test "Source Fragment" passed after 0.002 seconds.
✔ Test "Metadata Providers" passed after 0.003 seconds.
✔ Test "Timestamp Fragment" passed after 0.003 seconds.
✔ Test "Default built with LoggerFragmentBuilder" passed after 0.003 seconds.
✔ Test "Empty separator does not consume needsSeparator" passed after 0.002 seconds.
✔ Test "Simple Fragment" passed after 0.002 seconds.
✔ Test "LoggerFragmentBuilder with zero spaces" passed after 0.002 seconds.
✔ Test "LoggerFragmentBuilder" passed after 0.002 seconds.
✔ Test "Complex Conditional Fragment" with 3 test cases passed after 0.002 seconds.
✔ Test "Error Metadata Fragment" passed after 0.003 seconds.
✔ Test "Source Location" passed after 0.002 seconds.
✔ Test "Logging Levels" passed after 0.002 seconds.
✔ Test "Error" passed after 0.002 seconds.
✔ Suite "LoggerFragmentBuilder Tests" passed after 0.003 seconds.
◇ Test case passing 1 argument level → debug to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → info to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → notice to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → warning to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → error to "Log Level from ConfigReader" started.
◇ Test case passing 1 argument level → critical to "Log Level from ConfigReader" started.
✔ Test "Log Level from ConfigReader" with 7 test cases passed after 0.007 seconds.
✔ Suite "ConsoleLogger Tests" passed after 0.007 seconds.
✔ Test run with 19 tests in 2 suites passed after 0.008 seconds.
◇ Test run started.
↳ Testing Library Version: 6.5-dev (da2894961b77431)
↳ Target Platform: x86_64-unknown-freebsd
◇ Suite "Console Tests" started.
◇ Suite "Activity Tests" started.
◇ Suite "Terminal Tests" started.
◇ Test "Print Error" started.
◇ Test "Task Cancellation" started.
◇ Test "ConsoleText Operations" started.
◇ Test "Print Warning" started.
◇ Test "Stylize RGB Color" started.
◇ Test "Loading" started.
◇ Test "Progress" started.
◇ Test "Custom Indicator with ConsoleText" started.
◇ Test "Choose" started.
◇ Test "Activity Width Key" started.
◇ Test "Custom Indicator" started.
◇ Test "Ephemeral" started.
◇ Test "Center Empty ConsoleText Array" started.
◇ Test "Confirm with Invalid Input" started.
◇ Test "Confirm" started.
◇ Test "Confirm with Override" started.
◇ Test "Center Array of Strings" started.
◇ Test "Center String" started.
◇ Test "Center ConsoleText Array" started.
◇ Test "Output String" started.
◇ Test "Choose with Invalid Input" started.
◇ Test "Ask" started.
◇ Test "Center Empty Array of Strings" started.
◇ Test "Print Info" started.
◇ Test "Print Success" started.
◇ Test "Stylize Plain" started.
◇ Test "Stylize Foreground" started.
◇ Test "Stylize Palette Color" started.
◇ Test "Stylize All Attributes" started.
◇ Test "Stylize Bold" started.
◇ Test "Stylize Only Bold" started.
◇ Test "Stylize Background" started.
a
b
c
d
e
f
✔ Test "Print Error" passed after 0.003 seconds.
✔ Test "Print Warning" passed after 0.003 seconds.
✔ Test "ConsoleText Operations" passed after 0.003 seconds.
✔ Test "Stylize RGB Color" passed after 0.003 seconds.
Progress [...]
⠋ Loading
⠋ Loading
Loading [...]
✔ Test "Center Empty ConsoleText Array" passed after 0.004 seconds.
✔ Test "Confirm with Override" passed after 0.003 seconds.
✔ Test "Confirm" passed after 0.003 seconds.
✔ Test "Confirm with Invalid Input" passed after 0.004 seconds.
✔ Test "Center Array of Strings" passed after 0.003 seconds.
✔ Test "Center String" passed after 0.004 seconds.
✔ Test "Choose" passed after 0.004 seconds.
✔ Test "Output String" passed after 0.003 seconds.
✔ Test "Center ConsoleText Array" passed after 0.004 seconds.
✔ Test "Choose with Invalid Input" passed after 0.004 seconds.
✔ Test "Activity Width Key" passed after 0.004 seconds.
✔ Test "Center Empty Array of Strings" passed after 0.003 seconds.
✔ Test "Ask" passed after 0.004 seconds.
✔ Test "Print Info" passed after 0.004 seconds.
✔ Test "Print Success" passed after 0.003 seconds.
✔ Test "Stylize Foreground" passed after 0.002 seconds.
✔ Test "Stylize Plain" passed after 0.002 seconds.
✔ Test "Stylize Palette Color" passed after 0.002 seconds.
✔ Test "Stylize All Attributes" passed after 0.002 seconds.
✔ Test "Stylize Bold" passed after 0.002 seconds.
✔ Test "Stylize Only Bold" passed after 0.002 seconds.
✔ Test "Stylize Background" passed after 0.002 seconds.
Loading [...]
✔ Suite "Terminal Tests" passed after 0.005 seconds.
Loading [Failed]
✔ Test "Task Cancellation" passed after 1.003 seconds.
g
Progress [Done]
Progress [...]
✔ Test "Ephemeral" passed after 2.003 seconds.
✔ Suite "Console Tests" passed after 2.004 seconds.
Progress [Done]
✔ Test "Progress" passed after 2.204 seconds.
Loading [Done]
Loading [...]
Loading [Failed]
✔ Test "Loading" passed after 2.502 seconds.
[Done] Loading
[Done] Loading
✔ Test "Custom Indicator with ConsoleText" passed after 3.002 seconds.
✔ Test "Custom Indicator" passed after 3.002 seconds.
✔ Suite "Activity Tests" passed after 3.003 seconds.
✔ Test run with 32 tests in 3 suites passed after 3.003 seconds.

FreeBSD uses the Darwin-compatible sigaction layout (__sigaction_u.__sa_handler)
and has native TCSASOFT. Extend the Linux readpassphrase implementation to
cover FreeBSD so linux_readpassphrase is available when needed.
@hoanga
hoanga requested review from 0xTim and gwynne as code owners November 13, 2026 03:53
@gwynne gwynne added the semver-patch When merged, a new patch version release will be generated label Nov 13, 2026
@codecov

codecov Bot commented Nov 13, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 82.47%. Comparing base (0944ca5) to head (dcd81bb).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #251   +/-   ##
=======================================
  Coverage   82.47%   82.47%           
=======================================
  Files          29       29           
  Lines         896      896           
=======================================
  Hits          739      739           
  Misses        157      157           
Files with missing lines Coverage Δ
...ces/ConsoleKit/Terminal/readpassphrase_linux.swift 15.00% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@gwynne
gwynne merged commit 0b534dc into vapor:main Nov 13, 2026
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

semver-patch When merged, a new patch version release will be generated

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants