diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2023-03-22 22:03:37 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-03-22 09:12:40 -0700 |
commit | ecb95941df335fece45d91aa8912ad2795f726e5 (patch) | |
tree | d64f2f3cc91a56042110dbbad489ee28871775fc | |
parent | b589edf930977dbd75418e05d618a8047982dd59 (diff) | |
download | meta-openembedded-ecb95941df335fece45d91aa8912ad2795f726e5.tar.gz |
libyang: upgrade 2.1.30 -> 2.1.55
ChangeLog:
https://github.com/CESNET/libyang/releases/tag/v2.1.55
* Generate cases list dynamically in run-ptest.
* Add a patch to fix ptest.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libyang/libyang/run-ptest | 61 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libyang/libyang_2.1.55.bb (renamed from meta-oe/recipes-extended/libyang/libyang_2.1.30.bb) | 3 |
3 files changed, 34 insertions, 59 deletions
diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch new file mode 100644 index 0000000000..3c6aee9247 --- /dev/null +++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Wed, 22 Mar 2023 16:03:56 +0800 | ||
4 | Subject: [PATCH] test_context: skip test case test_searchdirs | ||
5 | |||
6 | Skip test case test_searchdirs as it searchs the source code directory. | ||
7 | |||
8 | Upstream-Status: Inappropriate [embedded specific] | ||
9 | |||
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
11 | --- | ||
12 | tests/utests/basic/test_context.c | 1 - | ||
13 | 1 file changed, 1 deletion(-) | ||
14 | |||
15 | diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c | ||
16 | index cfba1d30f..8c3bb7ad6 100644 | ||
17 | --- a/tests/utests/basic/test_context.c | ||
18 | +++ b/tests/utests/basic/test_context.c | ||
19 | @@ -1061,7 +1061,6 @@ int | ||
20 | main(void) | ||
21 | { | ||
22 | const struct CMUnitTest tests[] = { | ||
23 | - UTEST(test_searchdirs), | ||
24 | UTEST(test_options), | ||
25 | UTEST(test_models), | ||
26 | UTEST(test_imports), | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-oe/recipes-extended/libyang/libyang/run-ptest index 9682540e26..c507afb2f5 100644 --- a/meta-oe/recipes-extended/libyang/libyang/run-ptest +++ b/meta-oe/recipes-extended/libyang/libyang/run-ptest | |||
@@ -1,73 +1,18 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # Valid tests to run | ||
3 | tests="utest_binary \ | ||
4 | utest_bits \ | ||
5 | utest_boolean \ | ||
6 | utest_common \ | ||
7 | utest_decimal64 \ | ||
8 | utest_diff \ | ||
9 | utest_empty \ | ||
10 | utest_enumeration \ | ||
11 | utest_hash_table \ | ||
12 | utest_identityref \ | ||
13 | utest_inet_types \ | ||
14 | utest_inout \ | ||
15 | utest_instanceid \ | ||
16 | utest_instanceid_keys \ | ||
17 | utest_int16 \ | ||
18 | utest_int32 \ | ||
19 | utest_int64 \ | ||
20 | utest_int8 \ | ||
21 | utest_json \ | ||
22 | utest_leafref \ | ||
23 | utest_list \ | ||
24 | utest_lyb \ | ||
25 | utest_merge \ | ||
26 | utest_metadata \ | ||
27 | utest_nacm \ | ||
28 | utest_new \ | ||
29 | utest_parser_json \ | ||
30 | utest_parser_xml \ | ||
31 | utest_pattern \ | ||
32 | utest_printer_tree \ | ||
33 | utest_printer_xml \ | ||
34 | utest_plugins \ | ||
35 | utest_range \ | ||
36 | utest_schema \ | ||
37 | utest_schema_mount \ | ||
38 | utest_set \ | ||
39 | utest_string \ | ||
40 | utest_structure \ | ||
41 | utest_tree_data \ | ||
42 | utest_tree_schema_compile \ | ||
43 | utest_uint16 \ | ||
44 | utest_uint32 \ | ||
45 | utest_uint64 \ | ||
46 | utest_uint8 \ | ||
47 | utest_union \ | ||
48 | utest_validation \ | ||
49 | utest_xml \ | ||
50 | utest_xpath \ | ||
51 | utest_yang \ | ||
52 | utest_yangdata \ | ||
53 | utest_yang_types \ | ||
54 | utest_yanglib \ | ||
55 | utest_yin" | ||
56 | 2 | ||
57 | # cd into right directory | 3 | # cd into right directory |
58 | ptestdir=$(dirname "$(readlink -f "$0")") | 4 | ptestdir=$(dirname "$(readlink -f "$0")") |
59 | cd "$ptestdir"/tests || exit | 5 | cd "$ptestdir"/tests || exit |
60 | 6 | ||
61 | # Run specified tests | 7 | tests=$(find * -type f -name 'utest_*') |
8 | |||
62 | for f in $tests | 9 | for f in $tests |
63 | do | 10 | do |
64 | if test -e ./"$f"; then | 11 | if test -x ./"$f"; then |
65 | if ./"$f" > ./"$f".out 2> ./"$f".err; then | 12 | if ./"$f" > ./"$f".out 2> ./"$f".err; then |
66 | echo "PASS: $f" | 13 | echo "PASS: $f" |
67 | else | 14 | else |
68 | echo "FAIL: $f" | 15 | echo "FAIL: $f" |
69 | fi | 16 | fi |
70 | else | ||
71 | echo "SKIP: $f" | ||
72 | fi | 17 | fi |
73 | done | 18 | done |
diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb index 5adfc1d80b..b1438c3b2b 100644 --- a/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb +++ b/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb | |||
@@ -6,9 +6,10 @@ LICENSE = "BSD-3-Clause" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" |
8 | 8 | ||
9 | SRCREV = "35131b9396a965e01f899127763fb4e0871b845a" | 9 | SRCREV = "9a4e5b2ce30b9696116d6e654ee55caab5aafed8" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ | 11 | SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ |
12 | file://0001-test_context-skip-test-case-test_searchdirs.patch \ | ||
12 | file://run-ptest \ | 13 | file://run-ptest \ |
13 | " | 14 | " |
14 | 15 | ||