Skip to content

catch2 updates #452

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.

Sign up for GitHub

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

Open
igrr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

catch2 updates #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64f0167
fix(catch2): use correct syntax for linker flags
igrr Dec 2, 2024
2767e3a
change(catch2): upgrade to v3.7.1
igrr Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catch2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ idf_build_get_property(target IDF_TARGET)
if(NOT target STREQUAL "linux")
target_link_libraries(${catch_target} PUBLIC idf::pthread)
# Work around a linking dependency issue in ESP-IDF
target_link_libraries(${COMPONENT_LIB} PUBLIC "-Wl,-u getentropy")
target_link_options(${COMPONENT_LIB} INTERFACE "-u getentropy")
endif()

# If console component is present in the build, include the console
Expand Down
2 changes: 1 addition & 1 deletion catch2/Catch2
Open in desktop
Submodule Catch2 updated 64 files
+1 −1 CMakeLists.txt
+1 −2 docs/contributing.md
+22 −1 docs/release-notes.md
+9 −2 extras/Catch.cmake
+41 −87 extras/catch_amalgamated.cpp
+113 −71 extras/catch_amalgamated.hpp
+1 −1 meson.build
+1 −1 src/CMakeLists.txt
+1 −1 src/catch2/benchmark/catch_outlier_classification.hpp
+1 −1 src/catch2/catch_assertion_result.cpp
+1 −1 src/catch2/catch_message.hpp
+20 −16 src/catch2/catch_session.cpp
+6 −10 src/catch2/catch_test_case_info.cpp
+4 −2 src/catch2/catch_test_case_info.hpp
+1 −1 src/catch2/catch_timer.cpp
+1 −1 src/catch2/catch_translate_exception.hpp
+1 −1 src/catch2/catch_version.cpp
+1 −1 src/catch2/catch_version_macros.hpp
+1 −2 src/catch2/interfaces/catch_interfaces_capture.hpp
+2 −2 src/catch2/internal/catch_assertion_handler.cpp
+2 −2 src/catch2/internal/catch_assertion_handler.hpp
+1 −1 src/catch2/internal/catch_clara.cpp
+0 −6 src/catch2/internal/catch_context.cpp
+9 −4 src/catch2/internal/catch_context.hpp
+5 −6 src/catch2/internal/catch_decomposer.hpp
+15 −12 src/catch2/internal/catch_is_permutation.hpp
+3 −3 src/catch2/internal/catch_lazy_expr.hpp
+3 −1 src/catch2/internal/catch_random_integer_helpers.hpp
+0 −26 src/catch2/internal/catch_result_type.cpp
+16 −7 src/catch2/internal/catch_result_type.hpp
+2 −2 src/catch2/internal/catch_run_context.cpp
+1 −1 src/catch2/internal/catch_run_context.hpp
+5 −7 src/catch2/internal/catch_test_macro_impl.hpp
+1 −1 src/catch2/internal/catch_test_registry.cpp
+4 −2 src/catch2/internal/catch_test_registry.hpp
+8 −8 src/catch2/internal/catch_uniform_integer_distribution.hpp
+2 −22 src/catch2/internal/catch_xmlwriter.cpp
+15 −4 src/catch2/internal/catch_xmlwriter.hpp
+8 −0 src/catch2/matchers/catch_matchers_range_equals.hpp
+8 −4 src/catch2/matchers/internal/catch_matchers_impl.hpp
+1 −1 src/catch2/meson.build
+2 −2 src/catch2/reporters/catch_reporter_sonarqube.cpp
+1 −1 src/catch2/reporters/catch_reporter_sonarqube.hpp
+1 −0 tests/SelfTest/Baselines/automake.sw.approved.txt
+1 −0 tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+8 −2 tests/SelfTest/Baselines/compact.sw.approved.txt
+8 −2 tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+2 −2 tests/SelfTest/Baselines/console.std.approved.txt
+38 −2 tests/SelfTest/Baselines/console.sw.approved.txt
+38 −2 tests/SelfTest/Baselines/console.sw.multi.approved.txt
+2 −1 tests/SelfTest/Baselines/junit.sw.approved.txt
+2 −1 tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+155 −0 tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+155 −0 tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+13 −1 tests/SelfTest/Baselines/tap.sw.approved.txt
+13 −1 tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+2 −0 tests/SelfTest/Baselines/teamcity.sw.approved.txt
+2 −0 tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
+53 −2 tests/SelfTest/Baselines/xml.sw.approved.txt
+53 −2 tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+15 −0 tests/SelfTest/IntrospectiveTests/Clara.tests.cpp
+1 −1 tests/TestScripts/testBazelReporter.py
+1 −2 tools/scripts/buildAndTest.cmd
+1 −2 tools/scripts/buildAndTest.sh
2 changes: 1 addition & 1 deletion catch2/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7.0"
version: "3.7.1"
description: A modern, C++-native, test framework for unit-tests, TDD and BDD - using C++14, C++17 and later
url: https://github.com/espressif/idf-extra-components/tree/master/catch2
repository: https://github.com/espressif/idf-extra-components.git
Expand Down
4 changes: 2 additions & 2 deletions catch2/sbom_catch2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: catch2
version: 3.7.0
version: 3.7.1
cpe: cpe:2.3:a:catchorg:catch2:{}:*:*:*:*:*:*:*
supplier: 'Organization: catchorg <https://github.com/catchorg>'
description: A modern, C++-native, test framework for unit-tests, TDD and BDD - using C++14, C++17 and later
url: https://github.com/catchorg/Catch2
hash: 31588bb4f56b638dd5afc28d3ebff9b9dcefb88d
hash: fa43b77429ba76c462b1898d6cd2f2d7a9416b14