- Notifications
You must be signed in to change notification settings - Fork657
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Mac fixes#834
Open
snej wants to merge3 commits intodoctest:devChoose a base branch
base:dev
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Open
Mac fixes#834
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
The existing platform checks assumed that <TargetConditionals.h> wasalready included prior to doctest.h. If it wasn't, DOCTEST_PLATFORM_MACwouldn't get set because doctest was checking for macros defined inthat header.This caused issues in cross-platform code being run/tested on anApple platform; I first noticed that breakpoints on CHECK didn't work.Since the comment above said "this is how Catch does it", I went toa recent version of Catch and copied/adapted its platform check,which does work properly. I changed it a bit because there's no realneed to distinguish between macOS and iOS or other Apple platforms(AFAIK) since they work the same under the hood; DOCTEST_PLATFORM_MACwill be set on any Apple platform. If there's a need to specialize,there are several other macros in TargetConditionals.h that can bechecked.
Copied the ARM assembly instruction from Catch2 v3.It works on my M2 MacBook Pro :)
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@## dev #834 +/- ##======================================= Coverage 92.11% 92.11% ======================================= Files 2 2 Lines 2168 2168 ======================================= Hits 1997 1997 Misses 171 171 ☔ View full report in Codecov by Sentry. |
Hm, the Windows clang builds fail with an error I’ve never seen before, in code I didn’t touch: I see#824 has exactly the same errors, so this isn’t a regression from this PR. |
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixed issues using doctest on macOS. Each fix is in a separate commit.
<TargetConditionals.h>isn't included before doctest.hCHECKnot working on ARM Macs