From 0b7351142e2b1ff00617506a3e94c7a23ef91125 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 28 Apr 2025 15:57:18 +0800 Subject: nlohmann-json: Upgrade 3.11.3 -> 3.12.0 * License-Update: Copyright year updated to 2025 * It seems snprintf in glibc is locale-aware. And it will format floating-point numbers according to the locale when the numeric locale is set (e.g., de_DE). But in musl, snprintf does not respect locale settings for number formatting. It will always use a period as the decimal separator regardless of the locale set. So exclude TEST CASE "locale-dependent test (LC_NUMERIC=de_DE)" [1] right now and add the case back once the issue resolved by upstream. # ./run-ptest PASS: test-algorithms_cpp11 PASS: test-allocator_cpp11 PASS: test-alt-string_cpp11 PASS: test-assert_macro_cpp11 PASS: test-binary_formats_cpp11 PASS: test-bjdata_cpp11 PASS: test-bson_cpp11 PASS: test-byte_container_with_subtype_cpp11 PASS: test-capacity_cpp11 PASS: test-cbor_cpp11 PASS: test-class_const_iterator_cpp11 PASS: test-class_iterator_cpp11 PASS: test-class_lexer_cpp11 PASS: test-class_parser_cpp11 [snip] [1] https://github.com/nlohmann/json/issues/4767 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nlohmann-json/files/run-ptest | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-oe/recipes-devtools/nlohmann-json/files') diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest index 2f00267d50..d39ee6df8f 100755 --- a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest +++ b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest @@ -3,7 +3,11 @@ cd tests for atest in test-* ; do rm -rf tests.log - ./${atest} > tests.log 2>&1 + if [ ${atest} = "test-locale-cpp_cpp11" ]; then + ./${atest} --test-case-exclude="locale-dependent test (LC_NUMERIC=de_DE)" > tests.log 2>&1 + else + ./${atest} > tests.log 2>&1 + fi if [ $? = 0 ] ; then echo "PASS: ${atest}" else -- cgit v1.2.3-54-g00ecf