summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/import/src/catch2/TARGETS.catch2105
-rw-r--r--etc/repos.json10
2 files changed, 65 insertions, 50 deletions
diff --git a/etc/import/src/catch2/TARGETS.catch2 b/etc/import/src/catch2/TARGETS.catch2
index b066de9c..b5101702 100644
--- a/etc/import/src/catch2/TARGETS.catch2
+++ b/etc/import/src/catch2/TARGETS.catch2
@@ -14,6 +14,8 @@
, "benchmark/catch_sample_analysis.hpp"
, "benchmark/detail/catch_analyse.hpp"
, "benchmark/detail/catch_benchmark_function.hpp"
+ , "benchmark/detail/catch_benchmark_stats.hpp"
+ , "benchmark/detail/catch_benchmark_stats_fwd.hpp"
, "benchmark/detail/catch_complete_invoke.hpp"
, "benchmark/detail/catch_estimate_clock.hpp"
, "benchmark/detail/catch_measure.hpp"
@@ -21,12 +23,33 @@
, "benchmark/detail/catch_run_for_at_least.hpp"
, "benchmark/detail/catch_stats.hpp"
, "benchmark/detail/catch_timing.hpp"
- , "generators/catch_generator_exception.hpp"
+ , "catch_all.hpp"
+ , "catch_approx.hpp"
+ , "catch_assertion_info.hpp"
+ , "catch_assertion_result.hpp"
+ , "catch_config.hpp"
+ , "catch_get_random_seed.hpp"
+ , "catch_message.hpp"
+ , "catch_section_info.hpp"
+ , "catch_session.hpp"
+ , "catch_tag_alias.hpp"
+ , "catch_tag_alias_autoregistrar.hpp"
+ , "catch_template_test_macros.hpp"
+ , "catch_test_case_info.hpp"
+ , "catch_test_macros.hpp"
+ , "catch_test_spec.hpp"
+ , "catch_timer.hpp"
+ , "catch_tostring.hpp"
+ , "catch_totals.hpp"
+ , "catch_translate_exception.hpp"
+ , "catch_version.hpp"
+ , "catch_version_macros.hpp"
, "generators/catch_generators.hpp"
, "generators/catch_generators_adapters.hpp"
, "generators/catch_generators_all.hpp"
, "generators/catch_generators_random.hpp"
, "generators/catch_generators_range.hpp"
+ , "generators/catch_generator_exception.hpp"
, "interfaces/catch_interfaces_all.hpp"
, "interfaces/catch_interfaces_capture.hpp"
, "interfaces/catch_interfaces_config.hpp"
@@ -36,9 +59,9 @@
, "interfaces/catch_interfaces_registry_hub.hpp"
, "interfaces/catch_interfaces_reporter.hpp"
, "interfaces/catch_interfaces_reporter_factory.hpp"
- , "interfaces/catch_interfaces_reporter_registry.hpp"
, "interfaces/catch_interfaces_tag_alias_registry.hpp"
, "interfaces/catch_interfaces_testcase.hpp"
+ , "interfaces/catch_interfaces_test_invoker.hpp"
, "internal/catch_assertion_handler.hpp"
, "internal/catch_case_insensitive_comparisons.hpp"
, "internal/catch_case_sensitive.hpp"
@@ -48,14 +71,16 @@
, "internal/catch_compiler_capabilities.hpp"
, "internal/catch_config_android_logwrite.hpp"
, "internal/catch_config_counter.hpp"
+ , "internal/catch_config_prefix_messages.hpp"
+ , "internal/catch_config_static_analysis_support.hpp"
, "internal/catch_config_uncaught_exceptions.hpp"
, "internal/catch_config_wchar.hpp"
, "internal/catch_console_colour.hpp"
, "internal/catch_console_width.hpp"
, "internal/catch_container_nonmembers.hpp"
, "internal/catch_context.hpp"
- , "internal/catch_debug_console.hpp"
, "internal/catch_debugger.hpp"
+ , "internal/catch_debug_console.hpp"
, "internal/catch_decomposer.hpp"
, "internal/catch_enforce.hpp"
, "internal/catch_enum_values_registry.hpp"
@@ -66,6 +91,7 @@
, "internal/catch_getenv.hpp"
, "internal/catch_istream.hpp"
, "internal/catch_is_permutation.hpp"
+ , "internal/catch_jsonwriter.hpp"
, "internal/catch_lazy_expr.hpp"
, "internal/catch_leak_detector.hpp"
, "internal/catch_list.hpp"
@@ -80,7 +106,10 @@
, "internal/catch_platform.hpp"
, "internal/catch_polyfills.hpp"
, "internal/catch_preprocessor.hpp"
+ , "internal/catch_preprocessor_internal_stringify.hpp"
, "internal/catch_preprocessor_remove_parens.hpp"
+ , "internal/catch_random_floating_point_helpers.hpp"
+ , "internal/catch_random_integer_helpers.hpp"
, "internal/catch_random_number_generator.hpp"
, "internal/catch_random_seed_generation.hpp"
, "internal/catch_reporter_registry.hpp"
@@ -95,8 +124,8 @@
, "internal/catch_startup_exception_registry.hpp"
, "internal/catch_stdstreams.hpp"
, "internal/catch_stream_end_stop.hpp"
- , "internal/catch_string_manip.hpp"
, "internal/catch_stringref.hpp"
+ , "internal/catch_string_manip.hpp"
, "internal/catch_tag_alias_registry.hpp"
, "internal/catch_template_test_registry.hpp"
, "internal/catch_test_case_info_hasher.hpp"
@@ -105,10 +134,13 @@
, "internal/catch_test_failure_exception.hpp"
, "internal/catch_test_macro_impl.hpp"
, "internal/catch_test_registry.hpp"
+ , "internal/catch_test_run_info.hpp"
, "internal/catch_test_spec_parser.hpp"
, "internal/catch_textflow.hpp"
, "internal/catch_to_string.hpp"
, "internal/catch_uncaught_exceptions.hpp"
+ , "internal/catch_uniform_floating_point_distribution.hpp"
+ , "internal/catch_uniform_integer_distribution.hpp"
, "internal/catch_unique_name.hpp"
, "internal/catch_unique_ptr.hpp"
, "internal/catch_void_type.hpp"
@@ -119,36 +151,16 @@
, "matchers/catch_matchers_all.hpp"
, "matchers/catch_matchers_container_properties.hpp"
, "matchers/catch_matchers_contains.hpp"
- , "matchers/catch_matchers_range_equals.hpp"
, "matchers/catch_matchers_exception.hpp"
, "matchers/catch_matchers_floating_point.hpp"
, "matchers/catch_matchers_predicate.hpp"
, "matchers/catch_matchers_quantifiers.hpp"
+ , "matchers/catch_matchers_range_equals.hpp"
, "matchers/catch_matchers_string.hpp"
, "matchers/catch_matchers_templated.hpp"
, "matchers/catch_matchers_vector.hpp"
, "matchers/internal/catch_matchers_impl.hpp"
- , "catch_all.hpp"
- , "catch_approx.hpp"
- , "catch_assertion_info.hpp"
- , "catch_assertion_result.hpp"
- , "catch_config.hpp"
- , "catch_get_random_seed.hpp"
- , "catch_message.hpp"
- , "catch_section_info.hpp"
- , "catch_session.hpp"
- , "catch_tag_alias.hpp"
- , "catch_tag_alias_autoregistrar.hpp"
- , "catch_template_test_macros.hpp"
- , "catch_test_case_info.hpp"
- , "catch_test_macros.hpp"
- , "catch_test_spec.hpp"
- , "catch_timer.hpp"
- , "catch_tostring.hpp"
- , "catch_totals.hpp"
- , "catch_translate_exception.hpp"
- , "catch_version.hpp"
- , "catch_version_macros.hpp"
+ , "reporters/catch_reporters_all.hpp"
, "reporters/catch_reporter_automake.hpp"
, "reporters/catch_reporter_common_base.hpp"
, "reporters/catch_reporter_compact.hpp"
@@ -156,6 +168,7 @@
, "reporters/catch_reporter_cumulative_base.hpp"
, "reporters/catch_reporter_event_listener.hpp"
, "reporters/catch_reporter_helpers.hpp"
+ , "reporters/catch_reporter_json.hpp"
, "reporters/catch_reporter_junit.hpp"
, "reporters/catch_reporter_multi.hpp"
, "reporters/catch_reporter_registrars.hpp"
@@ -164,7 +177,6 @@
, "reporters/catch_reporter_tap.hpp"
, "reporters/catch_reporter_teamcity.hpp"
, "reporters/catch_reporter_xml.hpp"
- , "reporters/catch_reporters_all.hpp"
]
, "stage": ["catch2"]
}
@@ -172,12 +184,28 @@
{ "type": ["@", "rules", "data", "staged"]
, "srcs":
[ "benchmark/catch_chronometer.cpp"
+ , "benchmark/detail/catch_analyse.cpp"
, "benchmark/detail/catch_benchmark_function.cpp"
, "benchmark/detail/catch_run_for_at_least.cpp"
, "benchmark/detail/catch_stats.cpp"
- , "generators/catch_generator_exception.cpp"
+ , "catch_approx.cpp"
+ , "catch_assertion_result.cpp"
+ , "catch_config.cpp"
+ , "catch_get_random_seed.cpp"
+ , "catch_message.cpp"
+ , "catch_registry_hub.cpp"
+ , "catch_session.cpp"
+ , "catch_tag_alias_autoregistrar.cpp"
+ , "catch_test_case_info.cpp"
+ , "catch_test_spec.cpp"
+ , "catch_timer.cpp"
+ , "catch_tostring.cpp"
+ , "catch_totals.cpp"
+ , "catch_translate_exception.cpp"
+ , "catch_version.cpp"
, "generators/catch_generators.cpp"
, "generators/catch_generators_random.cpp"
+ , "generators/catch_generator_exception.cpp"
, "interfaces/catch_interfaces_capture.cpp"
, "interfaces/catch_interfaces_config.cpp"
, "interfaces/catch_interfaces_exception.cpp"
@@ -185,7 +213,6 @@
, "interfaces/catch_interfaces_registry_hub.cpp"
, "interfaces/catch_interfaces_reporter.cpp"
, "interfaces/catch_interfaces_reporter_factory.cpp"
- , "interfaces/catch_interfaces_reporter_registry.cpp"
, "interfaces/catch_interfaces_testcase.cpp"
, "internal/catch_assertion_handler.cpp"
, "internal/catch_case_insensitive_comparisons.cpp"
@@ -193,8 +220,8 @@
, "internal/catch_commandline.cpp"
, "internal/catch_console_colour.cpp"
, "internal/catch_context.cpp"
- , "internal/catch_debug_console.cpp"
, "internal/catch_debugger.cpp"
+ , "internal/catch_debug_console.cpp"
, "internal/catch_decomposer.cpp"
, "internal/catch_enforce.cpp"
, "internal/catch_enum_values_registry.cpp"
@@ -204,6 +231,7 @@
, "internal/catch_floating_point_helpers.cpp"
, "internal/catch_getenv.cpp"
, "internal/catch_istream.cpp"
+ , "internal/catch_jsonwriter.cpp"
, "internal/catch_lazy_expr.cpp"
, "internal/catch_leak_detector.cpp"
, "internal/catch_list.cpp"
@@ -223,8 +251,8 @@
, "internal/catch_source_line_info.cpp"
, "internal/catch_startup_exception_registry.cpp"
, "internal/catch_stdstreams.cpp"
- , "internal/catch_string_manip.cpp"
, "internal/catch_stringref.cpp"
+ , "internal/catch_string_manip.cpp"
, "internal/catch_tag_alias_registry.cpp"
, "internal/catch_test_case_info_hasher.cpp"
, "internal/catch_test_case_registry_impl.cpp"
@@ -245,20 +273,6 @@
, "matchers/catch_matchers_string.cpp"
, "matchers/catch_matchers_templated.cpp"
, "matchers/internal/catch_matchers_impl.cpp"
- , "catch_approx.cpp"
- , "catch_assertion_result.cpp"
- , "catch_config.cpp"
- , "catch_get_random_seed.cpp"
- , "catch_message.cpp"
- , "catch_registry_hub.cpp"
- , "catch_session.cpp"
- , "catch_tag_alias_autoregistrar.cpp"
- , "catch_test_case_info.cpp"
- , "catch_test_spec.cpp"
- , "catch_timer.cpp"
- , "catch_tostring.cpp"
- , "catch_totals.cpp"
- , "catch_version.cpp"
, "reporters/catch_reporter_automake.cpp"
, "reporters/catch_reporter_common_base.cpp"
, "reporters/catch_reporter_compact.cpp"
@@ -266,6 +280,7 @@
, "reporters/catch_reporter_cumulative_base.cpp"
, "reporters/catch_reporter_event_listener.cpp"
, "reporters/catch_reporter_helpers.cpp"
+ , "reporters/catch_reporter_json.cpp"
, "reporters/catch_reporter_junit.cpp"
, "reporters/catch_reporter_multi.cpp"
, "reporters/catch_reporter_registrars.cpp"
diff --git a/etc/repos.json b/etc/repos.json
index 188b7f8c..097d1b41 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -429,11 +429,11 @@
, "catch2":
{ "repository":
{ "type": "archive"
- , "content": "fd54249eeb20894ece50696a84ef674a0052b6da"
- , "fetch": "https://github.com/catchorg/Catch2/archive/refs/tags/v3.3.2.tar.gz"
- , "sha256": "8361907f4d9bff3ae7c1edb027f813659f793053c99b67837a0c0375f065bae2"
- , "sha512": "3d0c5666509a19be54ea0c48a3c8e1c4a951a2d991a7c9f7fe6d326661464538f1ab9dc573b1b2647f49fb6bef45bbd866142a4ce0fba38545ad182b8d55f61f"
- , "subdir": "Catch2-3.3.2"
+ , "content": "5af653af0c54ad580176a8cadb5a1cef8c880372"
+ , "fetch": "https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.3.tar.gz"
+ , "sha256": "8d723b0535c94860ef8cf6231580fa47d67a3416757ecb10639e40d748ab6c71"
+ , "sha512": "57c996f679cbad212cb0fde39e506bade37bd559c0e93e20f407f2a2f029e98b78661e10257f9c8e4cb5fd7d52d0ea1eae3d4a1f989c6d66fcb281e32e1688f6"
+ , "subdir": "Catch2-3.5.3"
}
, "target_root": "import targets"
, "target_file_name": "TARGETS.catch2"