Merge branch 'main' into modernize-zlib-install

Bill-hbrhbr · web-flow · commit 875bdb0542c2 · 2025-08-19T15:36:09.000+08:00
diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt
@@ -166,10 +166,8 @@ if(CLP_NEED_BOOST)
 endif()
 
 if(CLP_NEED_CATCH2)
-    find_package(Catch2 REQUIRED)
-    if (Catch2_FOUND)
-        message(STATUS "Found Catch2 ${Catch2_VERSION}")
-    endif()
+    find_package(Catch2 3.8.0 REQUIRED)
+    message(STATUS "Found Catch2 ${Catch2_VERSION}")
 endif()
 
 if(CLP_NEED_DATE)
@@ -703,7 +701,6 @@ set(SOURCE_FILES_unitTest
         tests/test-ir_parsing.cpp
         tests/test-ir_serializer.cpp
         tests/test-kql.cpp
-        tests/test-main.cpp
         tests/test-math_utils.cpp
         tests/test-MemoryMappedFile.cpp
         tests/test-NetworkReader.cpp
@@ -735,7 +732,7 @@ if(CLP_BUILD_TESTING)
             PRIVATE
             absl::flat_hash_map
             Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
-            Catch2::Catch2
+            Catch2::Catch2WithMain
             ${CURL_LIBRARIES}
             clp_s::search::ast
             clp_s::search::kql
diff --git a/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp b/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp
@@ -7,7 +7,8 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <ystdlib/error_handling/Result.hpp>
diff --git a/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp b/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp
@@ -6,7 +6,9 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/core.h>
 #include <nlohmann/json_fwd.hpp>
 
diff --git a/components/core/src/clp/ffi/ir_stream/search/test/test_utils.cpp b/components/core/src/clp/ffi/ir_stream/search/test/test_utils.cpp
@@ -9,7 +9,9 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/generators/catch_generators_range.hpp>
 
 #include "../../../../../clp_s/search/ast/BooleanLiteral.hpp"
 #include "../../../../../clp_s/search/ast/ColumnDescriptor.hpp"
diff --git a/components/core/src/clp/ffi/ir_stream/search/test/utils.hpp b/components/core/src/clp/ffi/ir_stream/search/test/utils.hpp
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <msgpack.hpp>
 #include <ystdlib/error_handling/Result.hpp>
 
diff --git a/components/core/tests/clp_s_test_utils.cpp b/components/core/tests/clp_s_test_utils.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp_s/ArchiveWriter.hpp"
 #include "../src/clp_s/InputConfig.hpp"
diff --git a/components/core/tests/test-BoundedReader.cpp b/components/core/tests/test-BoundedReader.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <string_view>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/BoundedReader.hpp"
 #include "../src/clp/ErrorCode.hpp"
diff --git a/components/core/tests/test-BufferedFileReader.cpp b/components/core/tests/test-BufferedFileReader.cpp
@@ -1,7 +1,7 @@
 #include <array>
 
 #include <boost/filesystem.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/BufferedFileReader.hpp"
 #include "../src/clp/FileReader.hpp"
diff --git a/components/core/tests/test-EncodedVariableInterpreter.cpp b/components/core/tests/test-EncodedVariableInterpreter.cpp
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/EncodedVariableInterpreter.hpp"
 #include "../src/clp/ir/types.hpp"
diff --git a/components/core/tests/test-FileDescriptorReader.cpp b/components/core/tests/test-FileDescriptorReader.cpp
@@ -4,7 +4,7 @@
 #include <string_view>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <ystdlib/containers/Array.hpp>
 
 #include "../src/clp/FileDescriptorReader.hpp"
diff --git a/components/core/tests/test-GlobalMetadataDBConfig.cpp b/components/core/tests/test-GlobalMetadataDBConfig.cpp
@@ -7,7 +7,7 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/GlobalMetadataDBConfig.hpp"
 
diff --git a/components/core/tests/test-GrepCore.cpp b/components/core/tests/test-GrepCore.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <log_surgeon/Lexer.hpp>
 #include <log_surgeon/SchemaParser.hpp>
 
diff --git a/components/core/tests/test-MemoryMappedFile.cpp b/components/core/tests/test-MemoryMappedFile.cpp
@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/FileReader.hpp"
 #include "../src/clp/ReaderInterface.hpp"
diff --git a/components/core/tests/test-NetworkReader.cpp b/components/core/tests/test-NetworkReader.cpp
@@ -9,7 +9,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <curl/curl.h>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
diff --git a/components/core/tests/test-ParserWithUserSchema.cpp b/components/core/tests/test-ParserWithUserSchema.cpp
@@ -7,7 +7,8 @@
 #include <utility>
 
 #include <boost/filesystem.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include <log_surgeon/LogParser.hpp>
 #include <log_surgeon/SchemaParser.hpp>
 
diff --git a/components/core/tests/test-SQLiteDB.cpp b/components/core/tests/test-SQLiteDB.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <fmt/format.h>
 
diff --git a/components/core/tests/test-Segment.cpp b/components/core/tests/test-Segment.cpp
@@ -1,7 +1,7 @@
 #include <unistd.h>
 
 #include <boost/filesystem.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/streaming_archive/reader/Segment.hpp"
 #include "../src/clp/streaming_archive/writer/Segment.hpp"
diff --git a/components/core/tests/test-Stopwatch.cpp b/components/core/tests/test-Stopwatch.cpp
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/Stopwatch.hpp"
 
diff --git a/components/core/tests/test-StreamingCompression.cpp b/components/core/tests/test-StreamingCompression.cpp
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include <boost/filesystem/operations.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <ystdlib/containers/Array.hpp>
 #include <zstd.h>
 
diff --git a/components/core/tests/test-TimestampPattern.cpp b/components/core/tests/test-TimestampPattern.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/TimestampPattern.hpp"
 
diff --git a/components/core/tests/test-Utils.cpp b/components/core/tests/test-Utils.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/foreach.hpp>
 #include <boost/range/combine.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/Utils.hpp"
 
diff --git a/components/core/tests/test-clp_s-delta-encode-log-order.cpp b/components/core/tests/test-clp_s-delta-encode-log-order.cpp
@@ -6,7 +6,8 @@
 #include <string_view>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 
 #include "../src/clp_s/archive_constants.hpp"
 #include "../src/clp_s/ArchiveReader.hpp"
diff --git a/components/core/tests/test-clp_s-end_to_end.cpp b/components/core/tests/test-clp_s-end_to_end.cpp
@@ -6,7 +6,8 @@
 #include <string_view>
 #include <utility>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/format.h>
 
 #include "../src/clp_s/CommandLineArguments.hpp"
diff --git a/components/core/tests/test-clp_s-range_index.cpp b/components/core/tests/test-clp_s-range_index.cpp
@@ -3,7 +3,8 @@
 #include <string>
 #include <string_view>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/format.h>
 #include <msgpack.hpp>
 #include <nlohmann/json.hpp>
diff --git a/components/core/tests/test-clp_s-search.cpp b/components/core/tests/test-clp_s-search.cpp
@@ -9,7 +9,8 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
 
diff --git a/components/core/tests/test-encoding_methods.cpp b/components/core/tests/test-encoding_methods.cpp
@@ -1,4 +1,6 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 
 #include "../src/clp/ffi/encoding_methods.hpp"
 #include "../src/clp/ir/types.hpp"
diff --git a/components/core/tests/test-ffi_IrUnitHandlerReq.cpp b/components/core/tests/test-ffi_IrUnitHandlerReq.cpp
@@ -3,7 +3,8 @@
 #include <string_view>
 #include <utility>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/ffi/ir_stream/decoding_methods.hpp"
 #include "../src/clp/ffi/ir_stream/IrUnitHandlerReq.hpp"
diff --git a/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp b/components/core/tests/test-ffi_KeyValuePairLogEvent.cpp
@@ -10,7 +10,7 @@
 #include <variant>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nlohmann/json.hpp>
 #include <nlohmann/json_fwd.hpp>
 
diff --git a/components/core/tests/test-ffi_SchemaTree.cpp b/components/core/tests/test-ffi_SchemaTree.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <msgpack.hpp>
 
 #include "../src/clp/ffi/SchemaTree.hpp"
diff --git a/components/core/tests/test-hash_utils.cpp b/components/core/tests/test-hash_utils.cpp
@@ -1,7 +1,7 @@
 #include <string_view>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/ErrorCode.hpp"
 #include "../src/clp/hash_utils.hpp"
diff --git a/components/core/tests/test-ir_encoding_methods.cpp b/components/core/tests/test-ir_encoding_methods.cpp
@@ -12,7 +12,9 @@
 #include <utility>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <msgpack.hpp>
 #include <nlohmann/json.hpp>
 
diff --git a/components/core/tests/test-ir_parsing.cpp b/components/core/tests/test-ir_parsing.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/ir/parsing.hpp"
 #include "../src/clp/ir/types.hpp"
diff --git a/components/core/tests/test-ir_serializer.cpp b/components/core/tests/test-ir_serializer.cpp
@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/ffi/ir_stream/decoding_methods.hpp"
 #include "../src/clp/ir/constants.hpp"
diff --git a/components/core/tests/test-kql.cpp b/components/core/tests/test-kql.cpp
@@ -2,7 +2,8 @@
 #include <string>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <fmt/core.h>
 #include <spdlog/spdlog.h>
 
diff --git a/components/core/tests/test-main.cpp b/components/core/tests/test-main.cpp
diff --git a/components/core/tests/test-math_utils.cpp b/components/core/tests/test-math_utils.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/math_utils.hpp"
 
diff --git a/components/core/tests/test-query_methods.cpp b/components/core/tests/test-query_methods.cpp
@@ -1,6 +1,7 @@
 #include <unordered_map>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp/ffi/encoding_methods.hpp"
 #include "../src/clp/ffi/search/ExactVariableToken.hpp"
diff --git a/components/core/tests/test-regex_utils.cpp b/components/core/tests/test-regex_utils.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <regex_utils/ErrorCode.hpp>
 #include <regex_utils/regex_translation_utils.hpp>
 #include <regex_utils/RegexToWildcardTranslatorConfig.hpp>
diff --git a/components/core/tests/test-sql.cpp b/components/core/tests/test-sql.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 #include <sstream>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "../src/clp_s/search/ast/EmptyExpr.hpp"
 #include "../src/clp_s/search/sql/sql.hpp"
diff --git a/components/core/tests/test-string_utils.cpp b/components/core/tests/test-string_utils.cpp
@@ -2,7 +2,8 @@
 
 #include <boost/foreach.hpp>
 #include <boost/range/combine.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <string_utils/constants.hpp>
 #include <string_utils/string_utils.hpp>
 
diff --git a/components/core/tests/test-utf8_utils.cpp b/components/core/tests/test-utf8_utils.cpp
@@ -7,7 +7,8 @@
 #include <string_view>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <nlohmann/json.hpp>
 
 #include "../src/clp/ffi/utils.hpp"
diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md
@@ -37,7 +37,7 @@ The task will download, build, and install (within the build directory) the foll
 |-----------------------------------------------------------------------|----------------|
 | [abseil-cpp](https://github.com/abseil/abseil-cpp)                    | 20250512.0     |
 | [ANTLR](https://www.antlr.org)                                        | v4.13.2        |
-| [Catch2](https://github.com/catchorg/Catch2.git)                      | v2.13.7        |
+| [Catch2](https://github.com/catchorg/Catch2.git)                      | v3.8.0         |
 | [date](https://github.com/HowardHinnant/date.git)                     | v3.0.1         |
 | [fmt](https://github.com/fmtlib/fmt)                                  | v10.2.1        |
 | [json](https://github.com/nlohmann/json.git)                          | v3.11.3        |
diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml
diff --git a/taskfiles/lint.yaml b/taskfiles/lint.yaml
