Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAPTURE not variadic when disabled #2378

Merged
merged 3 commits into from
Mar 4, 2022
Merged

Conversation

johnbeard
Copy link
Contributor

This caused errors on CAPTURE(a,b) when CATCH_CONFIG_DISABLE
is set.

Closes: #2316

This caused errors on CAPTURE(a,b) when CATCH_CONFIG_DISABLE
is set.

Closes: catchorg#2316
@codecov
Copy link

codecov bot commented Mar 3, 2022

Codecov Report

Merging #2378 (ecae3d9) into v2.x (958944d) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v2.x    #2378   +/-   ##
=======================================
  Coverage   90.10%   90.10%           
=======================================
  Files         113      113           
  Lines        5038     5038           
=======================================
  Hits         4539     4539           
  Misses        499      499           

@horenmar
Copy link
Member

horenmar commented Mar 3, 2022

Thanks, but you should also add a test to projects/ExtraTests/X02-DisabledMacros.cpp.

@johnbeard
Copy link
Contributor Author

johnbeard commented Mar 3, 2022

Re the X01 test: Is that right? The test fails due to that CATCH_FAIL_CHECK but I'm not sure if that's deliberate somehow? Or maybe the test should be split with that bit in a [!shouldfail]?

@horenmar
Copy link
Member

horenmar commented Mar 3, 2022

I don't see a failing CI build so I am not sure what I mean, but the changes look correct. If nothing comes up, I'll merge this tomorrow.

@horenmar horenmar merged commit ff151d2 into catchorg:v2.x Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants