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

Update Catch2 to v2.12.0 (from 2.9.1) #39797

Merged
merged 2 commits into from
Apr 22, 2020

Conversation

jbytheway
Copy link
Contributor

Summary

SUMMARY: Infrastructure "Update Catch2 to v2.12.0 (from 2.9.1)"

Purpose of change

To keep up to date with upstream improvements.

Describe the solution

This includes the upstreamed version of #39441, with some improvements from what was commited here. And various other improvements too. See the Catch2 changelog for details.

Had to add one NOLINT for our custom Cata clang-tidy tests, but otherwise this is the upstream header.

Describe alternatives you've considered

There were no specific requirements from the new version I thought we needed, so this isn't strictly necessary. It's mostly to make us no longer be using a custom fork of Catch2.

Testing

Ran unit tests.

This includes the upstreamed version of CleverRaven#39441, with some improvements.
And various other improvements too.
The new Catch2 version is structured so as to surface these warnings
that previously did not occur.  So they need to be resolved.
@kevingranade kevingranade merged commit b7e4ed1 into CleverRaven:master Apr 22, 2020
@jbytheway jbytheway deleted the catch2_update_2.12 branch April 22, 2020 00:46
@ZhilkinSerg
Copy link
Contributor

FYI - it breaks Windows cross-compile on Jenkins.

https://ci.narc.ro/job/Cataclysm-Matrix/Graphics=Tiles,Platform=Windows_x64/10559/console

15:49:41 In file included from test_main.cpp:33:0:
15:49:41 catch/catch.hpp: In function 'std::__cxx11::string Catch::getFormattedDuration(double)':
15:49:41 catch/catch.hpp:15556:9: error: 'libintl_sprintf' is not a member of 'std'
15:49:41          std::sprintf(buffer, "%.3f", duration);
15:49:41          ^
15:49:41 catch/catch.hpp:15556:9: note: suggested alternative:
15:49:41 In file included from ../src/translations.h:41:0,
15:49:41                  from ../src/bodypart.h:13,
15:49:41                  from ../src/character.h:21,
15:49:41                  from ../src/avatar.h:11,
15:49:41                  from test_main.cpp:30:
15:49:41 /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/libintl.h:361:12: note:   'libintl_sprintf'
15:49:41  extern int sprintf (char *, const char *, ...);
15:49:41             ^

@jbytheway
Copy link
Contributor Author

Thanks for noticing. Fixed in #39817 (hopefully).

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.

3 participants