Skip to content

Commit 8d40672

Browse files
committed
Adapt to upstream changes in anyxml JSON printing
Change-Id: I5f6de28cebc95a446549017c2768b450f4fd6526
1 parent 1533458 commit 8d40672

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.zuul.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- f38-gcc-cover:
55
required-projects:
66
- name: github/CESNET/libyang
7-
override-checkout: cesnet/2025-01-29
7+
override-checkout: devel
88
- name: github/onqtam/doctest
99
override-checkout: v2.3.6
1010
- f38-clang-asan-ubsan:
1111
required-projects: &projects
1212
- name: github/CESNET/libyang
13-
override-checkout: cesnet/2025-01-29
13+
override-checkout: devel
1414
- name: github/onqtam/doctest
1515
override-checkout: v2.4.11
1616
- f38-clang-tsan:

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ option(WITH_DOCS "Create and install internal documentation (needs Doxygen)" ${D
2929
option(BUILD_SHARED_LIBS "By default, shared libs are enabled. Turn off for a static build." ON)
3030

3131
find_package(PkgConfig REQUIRED)
32-
pkg_check_modules(LIBYANG REQUIRED libyang>=3.7.8 IMPORTED_TARGET)
32+
# FIXME: it's actually 3.7.12, but that hasn't been released yet
33+
pkg_check_modules(LIBYANG REQUIRED libyang>=3.7.11 IMPORTED_TARGET)
3334

3435
# FIXME from gcc 14.1 on we should be able to use the calendar/time from libstdc++ and thus remove the date dependency
3536
find_package(date)

tests/data_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ TEST_CASE("Data Node manipulation")
15681568
REQUIRE(*jsonAnyXmlNode.createdNode->printStr(libyang::DataFormat::JSON, libyang::PrintFlags::Shrink | libyang::PrintFlags::WithSiblings)
15691569
== R"|({"example-schema:ax":[1,2,3]})|"s);
15701570
REQUIRE(*jsonAnyXmlNode.createdNode->printStr(libyang::DataFormat::XML, libyang::PrintFlags::Shrink | libyang::PrintFlags::WithSiblings)
1571-
== R"|(<ax xmlns="http://example.com/coze"/>)|"s);
1571+
== R"|(<ax xmlns="http://example.com/coze">)|"s + origJSON + "</ax>");
15721572
}
15731573

15741574
REQUIRE(!!val);

0 commit comments

Comments
 (0)