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

build(cmake): upgrade catch2 to 2.13.9 #1977

Merged
merged 1 commit into from
Apr 21, 2022
Merged

build(cmake): upgrade catch2 to 2.13.9 #1977

merged 1 commit into from
Apr 21, 2022

Conversation

leogr
Copy link
Member

@leogr leogr commented Apr 21, 2022

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?
/area build

What this PR does / why we need it:

Upgrading catch2 addresses the problem reported in the following log:

In file included from /usr/include/signal.h:328,
                 from /home/leogr/code/github.com/falcosecurity/falco/build/catch2-prefix/include/catch.hpp:8007,
                 from /home/leogr/code/github.com/falcosecurity/falco/tests/test_base.cpp:18:
/home/leogr/code/github.com/falcosecurity/falco/build/catch2-prefix/include/catch.hpp:10791:58: error: call to non-'constexpr' function 'long int sysconf(int)'
10791 |     static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
      |                                                          ^~~~~~~~~~~
In file included from /usr/include/bits/sigstksz.h:24,
                 from /usr/include/signal.h:328,
                 from /home/leogr/code/github.com/falcosecurity/falco/build/catch2-prefix/include/catch.hpp:8007,
                 from /home/leogr/code/github.com/falcosecurity/falco/tests/test_base.cpp:18:
/usr/include/unistd.h:640:17: note: 'long int sysconf(int)' declared here
  640 | extern long int sysconf (int __name) __THROW;
      |                 ^~~~~~~
In file included from /home/leogr/code/github.com/falcosecurity/falco/tests/test_base.cpp:18:
/home/leogr/code/github.com/falcosecurity/falco/build/catch2-prefix/include/catch.hpp:10850:45: error: size of array 'altStackMem' is not an integral constant-expression
10850 |     char FatalConditionHandler::altStackMem[sigStackSize] = {};
      |                                             ^~~~~~~~~~~~

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

/milestone 0.32.0

Does this PR introduce a user-facing change?:

build(cmake): upgrade catch2 to 2.13.9

Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
Copy link
Contributor

@jasondellaluce jasondellaluce left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link
Contributor

poiana commented Apr 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jasondellaluce, leogr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [jasondellaluce,leogr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 8dd4bea into master Apr 21, 2022
@poiana poiana deleted the build/upgrade-catch2 branch April 21, 2022 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants