mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Mingli Yu
aa5e8edabb
* Backport 2 patches [1] [2] to fix the build failure under tests dir.
* Fetch the test data during do_fetch phase to avoid internet access
during test as some tests need test data.
# ./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
[snip]
PASS: test-unicode5_cpp11
PASS: test-user_defined_input_cpp11
PASS: test-windows_h_cpp11
PASS: test-wstring_cpp11
[1] https://github.com/nlohmann/json/commit/6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee
[2] https://github.com/nlohmann/json/commit/660d0b58565073975d6f5d94365d6cbf150a4cf8
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 013b4d5043)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
|
|
Date: Sun, 5 Mar 2023 14:11:22 +0100
|
|
Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range
|
|
comparisons (#3950)
|
|
|
|
Closes https://github.com/nlohmann/json/issues/3927
|
|
|
|
Upstream-Status: Backport [https://github.com/nlohmann/json/commit/660d0b58565073975d6f5d94365d6cbf150a4cf8]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
---
|
|
tests/src/unit-iterators2.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp
|
|
index 27926084..72a5d9dc 100644
|
|
--- a/tests/src/unit-iterators2.cpp
|
|
+++ b/tests/src/unit-iterators2.cpp
|
|
@@ -943,7 +943,7 @@ TEST_CASE("iterators 2")
|
|
json j_expected{5, 4, 3, 2, 1};
|
|
|
|
auto reversed = j | std::views::reverse;
|
|
- CHECK(reversed == j_expected);
|
|
+ CHECK(std::ranges::equal(reversed, j_expected));
|
|
}
|
|
|
|
SECTION("transform")
|
|
--
|
|
2.25.1
|
|
|