Merge fix/ubjson-valueless-budget into fix/reserve-unbacked-count, wrap docs, skip ICC-incompatible tests

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-11-13 07:35:11 +01:00
commit 619fafc087
96 files changed
+2880 -1464

No files matched your search

+24
View File
@@ -355,6 +355,20 @@ json_test_add_test_for(src/unit-comparison.cpp
MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
)
# test the walks over deeply nested values with the extreme settings of
# JSON_RECURSION_DEPTH_LIMIT: 0 (every walk uses its explicit stack from the
# first level on), 1, and 254 (the largest limit that fits the byte that counts
# the nesting of a copy)
foreach(recursion_depth_limit 0 1 254)
json_test_set_test_options(test-recursion_depth_limit_${recursion_depth_limit}
COMPILE_DEFINITIONS JSON_RECURSION_DEPTH_LIMIT=${recursion_depth_limit}
)
json_test_add_test_for(src/unit-recursion_depth_limit.cpp
NAME test-recursion_depth_limit_${recursion_depth_limit}
MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
)
endforeach()
# test the parser again with JSON_DIAGNOSTIC_POSITIONS enabled
json_test_set_test_options(test-class_parser_diagnostic_positions
COMPILE_DEFINITIONS JSON_DIAGNOSTIC_POSITIONS=1
@@ -364,6 +378,16 @@ json_test_add_test_for(src/unit-class_parser.cpp
MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
)
# test the conversions again without std::filesystem::path support: a
# std::u8string must be a JSON string in this configuration, too
json_test_set_test_options(test-conversions2_no_filesystem
COMPILE_DEFINITIONS JSON_HAS_FILESYSTEM=0 JSON_HAS_EXPERIMENTAL_FILESYSTEM=0
)
json_test_add_test_for(src/unit-conversions2.cpp
NAME test-conversions2_no_filesystem
MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
)
# test diagnostic positions again without regular diagnostics (JSON pointer paths)
json_test_set_test_options(test-diagnostic-positions_only
COMPILE_DEFINITIONS JSON_DIAGNOSTICS=0