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

Bump Catch2 to d548be26 for new SKIP macro #469

Merged
merged 1 commit into from Jan 17, 2023

Conversation

psalz
Copy link
Member

@psalz psalz commented Jan 12, 2023

I'm glad to announce that support for the long-awaited SKIP macro has been merged into Catch2!

This PR bumps the revision of the Catch2 submodule to current devel and adjusts most tests to use the new macro instead of manually printing a message and returning. The main advantage of using the macro is that test cases are reported explicitly as "skipped" instead of "failed" or "passed". This in turn will allow us to handle skipped tests separately in conformance report generation, which will become important once we start to decide on which test cases are required and which ones are optional for conformance.

The SKIP macro behaves essentially like a manual FAIL, in that it is the last thing executed in a test case. For this reason some of the legacy tests with more complex control flow still print manual skip messages, as they require some restructuring first (or rather, they should be converted to Catch2).

I've also updated the developer documentation to recommend the use of the SKIP macro when testing optional features.

Copy link
Contributor

@ProGTX ProGTX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Congratulations on getting SKIP merged into Catch2, this looks like a nice cleanup!

@bader bader mentioned this pull request Jan 13, 2023
Copy link
Contributor

@bader bader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.
I merged a few PR, which introduced merge conflicts. Could you check if we can apply SKIP macro to recently committed code?

- Change most locations with manual skip message to use the new SKIP
  macro. Some legacy tests with more complex control flow still use
  manual messages.
- Update developer documentation to recommend the use of SKIP macro when
  testing optional features.
@psalz
Copy link
Member Author

psalz commented Jan 17, 2023

Rebased onto current SYCL-2020 branch and resolved conflicts. There were no new opportunities for converting to SKIP.

@bader bader merged commit 6b75107 into KhronosGroup:SYCL-2020 Jan 17, 2023
@psalz psalz deleted the catch2-skip branch January 17, 2023 16:51
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.

None yet

3 participants