catch2: bump to version 3.3.2

tests have been updated accordingly

3 files changed, 323 insertions, 9 deletions

diff --git a/etc/import/TARGETS.catch2 b/etc/import/TARGETS.catch2
index 44fdda10..80bfcac8 100644
--- a/etc/import/TARGETS.catch2
+++ b/etc/import/TARGETS.catch2
@@ -1,7 +1,36 @@
-{ "catch2":
+{ "catch2-config-header-blueprint":
+  { "type": ["@", "rules", "CC/auto", "config_file"]
+  , "input": [["./", "src/catch2", "catch_user_config.hpp.in"]]
+  , "output": ["catch2", "catch_user_config.hpp"]
+  , "magic_string": ["cmakedefine"]
+  , "@only": ["true"]
+  }
+, "catch2-config-header":
+  { "type": "configure"
+  , "target": "catch2-config-header-blueprint"
+  , "config":
+    { "type": "let*"
+    , "bindings":
+      [ [ "defines"
+        , [ ["CATCH_CONFIG_DEFAULT_REPORTER", "console"]
+          , ["CATCH_CONFIG_CONSOLE_WIDTH", "80"]
+          ]
+        ]
+      ]
+    , "body": {"type": "env", "vars": ["defines"]}
+    }
+  }
+, "catch2":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["Catch2"]
+  , "hdrs": [["./", "src/catch2", "hdrs"], "catch2-config-header"]
+  , "srcs": [["./", "src/catch2", "srcs"]]
+  }
+, "catch2-main":
   { "type": ["@", "rules", "CC", "library"]
-  , "hdrs": ["catch.hpp"]
-  , "private-ldflags": ["-lpthread"]
-  , "stage": ["catch2"]
+  , "name": ["Catch2Main"]
+  , "hdrs": ["catch2-config-header"]
+  , "srcs": [["./", "src/catch2", "main"]]
+  , "deps": ["catch2"]
   }
 }
diff --git a/etc/import/src/catch2/TARGETS.catch2 b/etc/import/src/catch2/TARGETS.catch2
new file mode 100644
index 00000000..b066de9c
--- /dev/null
+++ b/etc/import/src/catch2/TARGETS.catch2
@@ -0,0 +1,285 @@
+{ "hdrs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs":
+    [ "benchmark/catch_benchmark.hpp"
+    , "benchmark/catch_benchmark_all.hpp"
+    , "benchmark/catch_chronometer.hpp"
+    , "benchmark/catch_clock.hpp"
+    , "benchmark/catch_constructor.hpp"
+    , "benchmark/catch_environment.hpp"
+    , "benchmark/catch_estimate.hpp"
+    , "benchmark/catch_execution_plan.hpp"
+    , "benchmark/catch_optimizer.hpp"
+    , "benchmark/catch_outlier_classification.hpp"
+    , "benchmark/catch_sample_analysis.hpp"
+    , "benchmark/detail/catch_analyse.hpp"
+    , "benchmark/detail/catch_benchmark_function.hpp"
+    , "benchmark/detail/catch_complete_invoke.hpp"
+    , "benchmark/detail/catch_estimate_clock.hpp"
+    , "benchmark/detail/catch_measure.hpp"
+    , "benchmark/detail/catch_repeat.hpp"
+    , "benchmark/detail/catch_run_for_at_least.hpp"
+    , "benchmark/detail/catch_stats.hpp"
+    , "benchmark/detail/catch_timing.hpp"
+    , "generators/catch_generator_exception.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"
+    , "interfaces/catch_interfaces_all.hpp"
+    , "interfaces/catch_interfaces_capture.hpp"
+    , "interfaces/catch_interfaces_config.hpp"
+    , "interfaces/catch_interfaces_enum_values_registry.hpp"
+    , "interfaces/catch_interfaces_exception.hpp"
+    , "interfaces/catch_interfaces_generatortracker.hpp"
+    , "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"
+    , "internal/catch_assertion_handler.hpp"
+    , "internal/catch_case_insensitive_comparisons.hpp"
+    , "internal/catch_case_sensitive.hpp"
+    , "internal/catch_clara.hpp"
+    , "internal/catch_commandline.hpp"
+    , "internal/catch_compare_traits.hpp"
+    , "internal/catch_compiler_capabilities.hpp"
+    , "internal/catch_config_android_logwrite.hpp"
+    , "internal/catch_config_counter.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_decomposer.hpp"
+    , "internal/catch_enforce.hpp"
+    , "internal/catch_enum_values_registry.hpp"
+    , "internal/catch_errno_guard.hpp"
+    , "internal/catch_exception_translator_registry.hpp"
+    , "internal/catch_fatal_condition_handler.hpp"
+    , "internal/catch_floating_point_helpers.hpp"
+    , "internal/catch_getenv.hpp"
+    , "internal/catch_istream.hpp"
+    , "internal/catch_is_permutation.hpp"
+    , "internal/catch_lazy_expr.hpp"
+    , "internal/catch_leak_detector.hpp"
+    , "internal/catch_list.hpp"
+    , "internal/catch_logical_traits.hpp"
+    , "internal/catch_message_info.hpp"
+    , "internal/catch_meta.hpp"
+    , "internal/catch_move_and_forward.hpp"
+    , "internal/catch_noncopyable.hpp"
+    , "internal/catch_optional.hpp"
+    , "internal/catch_output_redirect.hpp"
+    , "internal/catch_parse_numbers.hpp"
+    , "internal/catch_platform.hpp"
+    , "internal/catch_polyfills.hpp"
+    , "internal/catch_preprocessor.hpp"
+    , "internal/catch_preprocessor_remove_parens.hpp"
+    , "internal/catch_random_number_generator.hpp"
+    , "internal/catch_random_seed_generation.hpp"
+    , "internal/catch_reporter_registry.hpp"
+    , "internal/catch_reporter_spec_parser.hpp"
+    , "internal/catch_result_type.hpp"
+    , "internal/catch_reusable_string_stream.hpp"
+    , "internal/catch_run_context.hpp"
+    , "internal/catch_section.hpp"
+    , "internal/catch_sharding.hpp"
+    , "internal/catch_singletons.hpp"
+    , "internal/catch_source_line_info.hpp"
+    , "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_tag_alias_registry.hpp"
+    , "internal/catch_template_test_registry.hpp"
+    , "internal/catch_test_case_info_hasher.hpp"
+    , "internal/catch_test_case_registry_impl.hpp"
+    , "internal/catch_test_case_tracker.hpp"
+    , "internal/catch_test_failure_exception.hpp"
+    , "internal/catch_test_macro_impl.hpp"
+    , "internal/catch_test_registry.hpp"
+    , "internal/catch_test_spec_parser.hpp"
+    , "internal/catch_textflow.hpp"
+    , "internal/catch_to_string.hpp"
+    , "internal/catch_uncaught_exceptions.hpp"
+    , "internal/catch_unique_name.hpp"
+    , "internal/catch_unique_ptr.hpp"
+    , "internal/catch_void_type.hpp"
+    , "internal/catch_wildcard_pattern.hpp"
+    , "internal/catch_windows_h_proxy.hpp"
+    , "internal/catch_xmlwriter.hpp"
+    , "matchers/catch_matchers.hpp"
+    , "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_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_reporter_automake.hpp"
+    , "reporters/catch_reporter_common_base.hpp"
+    , "reporters/catch_reporter_compact.hpp"
+    , "reporters/catch_reporter_console.hpp"
+    , "reporters/catch_reporter_cumulative_base.hpp"
+    , "reporters/catch_reporter_event_listener.hpp"
+    , "reporters/catch_reporter_helpers.hpp"
+    , "reporters/catch_reporter_junit.hpp"
+    , "reporters/catch_reporter_multi.hpp"
+    , "reporters/catch_reporter_registrars.hpp"
+    , "reporters/catch_reporter_sonarqube.hpp"
+    , "reporters/catch_reporter_streaming_base.hpp"
+    , "reporters/catch_reporter_tap.hpp"
+    , "reporters/catch_reporter_teamcity.hpp"
+    , "reporters/catch_reporter_xml.hpp"
+    , "reporters/catch_reporters_all.hpp"
+    ]
+  , "stage": ["catch2"]
+  }
+, "srcs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs":
+    [ "benchmark/catch_chronometer.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"
+    , "generators/catch_generators.cpp"
+    , "generators/catch_generators_random.cpp"
+    , "interfaces/catch_interfaces_capture.cpp"
+    , "interfaces/catch_interfaces_config.cpp"
+    , "interfaces/catch_interfaces_exception.cpp"
+    , "interfaces/catch_interfaces_generatortracker.cpp"
+    , "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"
+    , "internal/catch_clara.cpp"
+    , "internal/catch_commandline.cpp"
+    , "internal/catch_console_colour.cpp"
+    , "internal/catch_context.cpp"
+    , "internal/catch_debug_console.cpp"
+    , "internal/catch_debugger.cpp"
+    , "internal/catch_decomposer.cpp"
+    , "internal/catch_enforce.cpp"
+    , "internal/catch_enum_values_registry.cpp"
+    , "internal/catch_errno_guard.cpp"
+    , "internal/catch_exception_translator_registry.cpp"
+    , "internal/catch_fatal_condition_handler.cpp"
+    , "internal/catch_floating_point_helpers.cpp"
+    , "internal/catch_getenv.cpp"
+    , "internal/catch_istream.cpp"
+    , "internal/catch_lazy_expr.cpp"
+    , "internal/catch_leak_detector.cpp"
+    , "internal/catch_list.cpp"
+    , "internal/catch_message_info.cpp"
+    , "internal/catch_output_redirect.cpp"
+    , "internal/catch_parse_numbers.cpp"
+    , "internal/catch_polyfills.cpp"
+    , "internal/catch_random_number_generator.cpp"
+    , "internal/catch_random_seed_generation.cpp"
+    , "internal/catch_reporter_registry.cpp"
+    , "internal/catch_reporter_spec_parser.cpp"
+    , "internal/catch_result_type.cpp"
+    , "internal/catch_reusable_string_stream.cpp"
+    , "internal/catch_run_context.cpp"
+    , "internal/catch_section.cpp"
+    , "internal/catch_singletons.cpp"
+    , "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_tag_alias_registry.cpp"
+    , "internal/catch_test_case_info_hasher.cpp"
+    , "internal/catch_test_case_registry_impl.cpp"
+    , "internal/catch_test_case_tracker.cpp"
+    , "internal/catch_test_failure_exception.cpp"
+    , "internal/catch_test_registry.cpp"
+    , "internal/catch_test_spec_parser.cpp"
+    , "internal/catch_textflow.cpp"
+    , "internal/catch_uncaught_exceptions.cpp"
+    , "internal/catch_wildcard_pattern.cpp"
+    , "internal/catch_xmlwriter.cpp"
+    , "matchers/catch_matchers.cpp"
+    , "matchers/catch_matchers_container_properties.cpp"
+    , "matchers/catch_matchers_exception.cpp"
+    , "matchers/catch_matchers_floating_point.cpp"
+    , "matchers/catch_matchers_predicate.cpp"
+    , "matchers/catch_matchers_quantifiers.cpp"
+    , "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"
+    , "reporters/catch_reporter_console.cpp"
+    , "reporters/catch_reporter_cumulative_base.cpp"
+    , "reporters/catch_reporter_event_listener.cpp"
+    , "reporters/catch_reporter_helpers.cpp"
+    , "reporters/catch_reporter_junit.cpp"
+    , "reporters/catch_reporter_multi.cpp"
+    , "reporters/catch_reporter_registrars.cpp"
+    , "reporters/catch_reporter_sonarqube.cpp"
+    , "reporters/catch_reporter_streaming_base.cpp"
+    , "reporters/catch_reporter_tap.cpp"
+    , "reporters/catch_reporter_teamcity.cpp"
+    , "reporters/catch_reporter_xml.cpp"
+    ]
+  , "stage": ["catch2"]
+  }
+, "main":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs": ["internal/catch_main.cpp"]
+  , "stage": ["catch2"]
+  }
+}
diff --git a/etc/repos.json b/etc/repos.json
index a0256ddf..ffdf84e1 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -403,11 +403,11 @@
   , "catch2":
     { "repository":
       { "type": "archive"
-      , "content": "a154ae9e2daad22c95cff6186b18637d4e5f338c"
-      , "fetch": "https://github.com/catchorg/Catch2/archive/v2.13.1.tar.gz"
-      , "sha256": "36bcc9e6190923961be11e589d747e606515de95f10779e29853cfeae560bd6c"
-      , "sha512": "2c5394d4ca8346d7d64203048f4ba503c2f813aa2ea7d065ffb9c63f532b7f18daee3e1a4a37314575e33f14259182edd1db030ed254b97a2e3f11d295555397"
-      , "subdir": "Catch2-2.13.1/single_include/catch2"
+      , "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"
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.catch2"